Changes between Version 5 and Version 6 of RepositoryGuidelines

Timestamp:

Mar 12, 2012, 2:23:13 PM (13 years ago)

Author:

FrederikHeber

Comment:

small typo fixes in new section

RepositoryGuidelines

@@ -89 +89 @@
    * ... and end of your branch, here it is ''!MyBranch''.
 
-Note again that the the interval of your commits to replay on top of the now current ''stable'' has to be given as ''[first-1, last]'', where ''first'' is your first and ''last'' your last commit, i.e. we need the one commit before (If you are unsure, select the hash code of your first commit and add ''~1'' to it. You may check whether it's the correct one via 
+Note again that the the interval of your commits to replay on top of the now current ''stable'' has to be given as ''[first-1, last]'', where ''first'' is your first and ''last'' your last commit, i.e. we need the one commit before it (If you are unsure, select the hash code of your first commit and add ''~1'' to it. You may check whether it's the correct one via 
 {{{
 git log <hash>~1
 }}}
-Log should display none of your commits but only immediately up till your last one.
+Log should display none of your commits but only immediately up till your last one).
 
 Then execute
@@ -99 +99 @@
 git rebase --onto stable <hash> MyBranch
 }}}
-and git will replay each of your commit on top of the current ''stable'' branch.
+and git will replay each of your commits on top of the current ''stable'' branch.
 
 It may happen that changes in your branch and changes occuring between ''v0.9.9'' and ''v1.0.0'' coincide. This will cause an interruption, a so-called conflict, and git will ask you to fix this by yourself.