diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-10-10 15:31:42 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-10-10 15:31:42 +0000 |
| commit | a476efaaca349e01dfbc4e1009ab534aa511479b (patch) | |
| tree | b0f05e148f284deb9030edaf25419f9f704adb32 /git-rebase.txt | |
| parent | 7cc912979feaec3ed65d4491e129ed48507f6994 (diff) | |
| download | git-htmldocs-a476efaaca349e01dfbc4e1009ab534aa511479b.tar.gz | |
Autogenerated HTML docs for v1.6.0.2-514-g23abd3
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index 59c1b021a..32f0f122e 100644 --- a/git-rebase.txt +++ b/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 |