summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Kaartic Sivaraam <kaarticsivaraam91196@gmail.com>2017-07-10 19:48:30 +0530
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-07-10 09:50:36 -0700
commit01826066b085ca136a1fc81ab964fab2d240ad86 (patch)
treea8525acf8f6e62dc089ab48f06ea8bd45e03abaf /Documentation
parentGit 2.10.3 (diff)
downloadtgif-01826066b085ca136a1fc81ab964fab2d240ad86.tar.xz
doc: correct a mistake in an illustration
The first illustration of the "RECOVERING FROM UPSTREAM REBASE" section in the 'git-rebase' documentation meant to depict that there are number of commits on the 'master' branch, but it is longer than the 'master' branch in the following illustrations by one commit, even though there is no resetting of 'master' to lose that commit. Correct it. Signed-off-by: Kaartic Sivaraam <kaarticsivaraam91196@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-rebase.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index de222c81af..3290fc5db9 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -665,7 +665,7 @@ on this 'subsystem'. You might end up with a history like the
following:
------------
- o---o---o---o---o---o---o---o---o master
+ o---o---o---o---o---o---o---o master
\
o---o---o---o---o subsystem
\