Fixed some grammatical errors in git-rebase.txt documentation.
Generally, the dependent clause "for example" is suffixed with a comma. Used present tense where appropriate to be consistent with the other paragraphs. Rewrote the paragraph in the second hunk to be more clear. Signed-off-by: Garry Dolley <gdolley@ucla.edu> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Garry Dolley committed
Sep 24, 2008 at 02:51 UTC
e2b850b2da711c5cca563f221062bf22c57373bf
1 file changed
+4
-4
Documentation/git-rebase.txt
+4
-4
@@ -92,7 +92,7 @@ branch to another, to pretend that you forked the topic branch
92
from the latter branch, using `rebase --onto`.
93
94
First let's assume your 'topic' is based on branch 'next'.
95
-For example feature developed in 'topic' depends on some
95
+For example, a feature developed in 'topic' depends on some
96
functionality which is found in 'next'.
97
98
------------
@@ -103,9 +103,9 @@ functionality which is found in 'next'.
103
o---o---o topic
104
------------
105
106
-We would want to make 'topic' forked from branch 'master',
107
-for example because the functionality 'topic' branch depend on
108
-got merged into more stable 'master' branch, like this:
106
+We want to make 'topic' forked from branch 'master'; for example,
107
+because the functionality on which 'topic' depends was merged into the
108
+more stable 'master' branch. We want our tree to look like this:
109
110
------------
111
o---o---o---o---o master