summaryrefslogtreecommitdiff
path: root/Documentation/git-rebase.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-07-12 22:18:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-07-12 22:18:24 (GMT)
commita5a3c5afcd0de022648c28f51d8912703c56c22f (patch)
tree57cd2d7f7fe6c08424e69de386533dd39e4f98a2 /Documentation/git-rebase.txt
parent094aa09aa59cd9fc417aa250f6ac46e602b40325 (diff)
parent01826066b085ca136a1fc81ab964fab2d240ad86 (diff)
downloadgit-a5a3c5afcd0de022648c28f51d8912703c56c22f.zip
git-a5a3c5afcd0de022648c28f51d8912703c56c22f.tar.gz
git-a5a3c5afcd0de022648c28f51d8912703c56c22f.tar.bz2
Merge branch 'ks/fix-rebase-doc-picture'
Doc update. * ks/fix-rebase-doc-picture: doc: correct a mistake in an illustration
Diffstat (limited to 'Documentation/git-rebase.txt')
-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 a5afd60..4f6bed6 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -675,7 +675,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
\