diff options
| author |  Garry Dolley <gdolley@ucla.edu> | 2008-09-24 02:51:27 -0700 |
|---|---|---|
| committer |  Shawn O. Pearce <spearce@spearce.org> | 2008-09-24 09:12:07 -0700 |
| commit | e2b850b2da711c5cca563f221062bf22c57373bf (patch) | |
| tree | 3631b61e7358bf34d125cde950fe083d9c2ef615 | |
| parent | Merge branch 'maint' (diff) | |
| download | tgif-e2b850b2da711c5cca563f221062bf22c57373bf.tar.xz | |
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>
| -rw-r--r-- | Documentation/git-rebase.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 59c1b021a6..32f0f122e9 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -92,7 +92,7 @@ branch to another, to pretend that you forked the topic branch from the latter branch, using `rebase --onto`. First let's assume your 'topic' is based on branch 'next'. -For example feature developed in 'topic' depends on some +For example, a feature developed in 'topic' depends on some functionality which is found in 'next'. ------------ @@ -103,9 +103,9 @@ functionality which is found in 'next'. o---o---o topic ------------ -We would want to make 'topic' forked from branch 'master', -for example because the functionality 'topic' branch depend on -got merged into more stable 'master' branch, like this: +We want to make 'topic' forked from branch 'master'; for example, +because the functionality on which 'topic' depends was merged into the +more stable 'master' branch. We want our tree to look like this: ------------ o---o---o---o---o master |