summaryrefslogtreecommitdiffstats
path: root/git-rebase.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-10-10 15:31:42 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-10-10 15:31:42 +0000
commita476efaaca349e01dfbc4e1009ab534aa511479b (patch)
treeb0f05e148f284deb9030edaf25419f9f704adb32 /git-rebase.html
parent7cc912979feaec3ed65d4491e129ed48507f6994 (diff)
downloadgit-htmldocs-a476efaaca349e01dfbc4e1009ab534aa511479b.tar.gz
Autogenerated HTML docs for v1.6.0.2-514-g23abd3
Diffstat (limited to 'git-rebase.html')
-rw-r--r--git-rebase.html10
1 files changed, 5 insertions, 5 deletions
diff --git a/git-rebase.html b/git-rebase.html
index f0802c1fb..ba8f0c03a 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -394,7 +394,7 @@ but have different committer information):</p></div>
branch to another, to pretend that you forked the topic branch
from the latter branch, using <tt>rebase --onto</tt>.</p></div>
<div class="para"><p>First let's assume your <em>topic</em> is based on branch <em>next</em>.
-For example feature developed in <em>topic</em> depends on some
+For example, a feature developed in <em>topic</em> depends on some
functionality which is found in <em>next</em>.</p></div>
<div class="listingblock">
<div class="content">
@@ -404,9 +404,9 @@ functionality which is found in <em>next</em>.</p></div>
\
o---o---o topic</tt></pre>
</div></div>
-<div class="para"><p>We would want to make <em>topic</em> forked from branch <em>master</em>,
-for example because the functionality <em>topic</em> branch depend on
-got merged into more stable <em>master</em> branch, like this:</p></div>
+<div class="para"><p>We want to make <em>topic</em> forked from branch <em>master</em>; for example,
+because the functionality on which <em>topic</em> depends was merged into the
+more stable <em>master</em> branch. We want our tree to look like this:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt> o---o---o---o---o master
@@ -907,7 +907,7 @@ Johannes E. Schindelin &lt;johannes.schindelin@gmx.de&gt;</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-09-19 06:33:07 UTC
+Last updated 2008-10-10 15:30:49 UTC
</div>
</div>
</body>