summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-07-21 15:03:39 -0700
committerJunio C Hamano <gitster@pobox.com>2017-07-21 15:03:39 -0700
commitbae7e3f153f90b96438e6972e31c540ae9cf8ca0 (patch)
tree792835bf31211f0a39af09a09d508c360cd9dc5f
parentbdea5bae226f92727be0e9fc4603099030e6496d (diff)
parent01826066b085ca136a1fc81ab964fab2d240ad86 (diff)
downloadgit-bae7e3f153f90b96438e6972e31c540ae9cf8ca0.tar.gz
Merge branch 'ks/fix-rebase-doc-picture' into maint
Doc update. * ks/fix-rebase-doc-picture: doc: correct a mistake in an illustration
-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 53f4e14444..652a99062c 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
\