summaryrefslogtreecommitdiffstats
path: root/git-rebase.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-05-22 13:48:55 -0700
committerJunio C Hamano <gitster@pobox.com>2015-05-22 13:48:55 -0700
commit1dbca52d492eab38500f435fc9af5f463d3e9c95 (patch)
tree91d8a505b64826863ccc4f99576a2a8b0f6c07fe /git-rebase.html
parente1b28594a7acfaa493ca0cf32e7e970dc549527a (diff)
downloadgit-htmldocs-1dbca52d492eab38500f435fc9af5f463d3e9c95.tar.gz
Autogenerated HTML docs for v2.4.1-314-g9532e
Diffstat (limited to 'git-rebase.html')
-rw-r--r--git-rebase.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-rebase.html b/git-rebase.html
index cd828e116..e81e847ab 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -814,8 +814,8 @@ followed by <code>git rebase master</code>. When rebase exits <code>topic</code>
remain the checked-out branch.</p></div>
<div class="paragraph"><p>If the upstream branch already contains a change you have made (e.g.,
because you mailed a patch which was applied upstream), then that commit
-will be skipped. For example, running &#8216;git rebase master` on the
-following history (in which A&#8217; and A introduce the same set of changes,
+will be skipped. For example, running <code>git rebase master</code> on the
+following history (in which <code>A'</code> and <code>A</code> introduce the same set of changes,
but have different committer information):</p></div>
<div class="listingblock">
<div class="content">
@@ -1975,7 +1975,7 @@ reorder commits tend to produce counterintuitive results.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2015-04-02 14:03:56 PDT
+Last updated 2015-05-22 13:47:07 PDT
</div>
</div>
</body>