]> git.ipfire.org Git - thirdparty/git.git/commitdiff
user-manual: be consistent in illustrations to 'git rebase'
authorKirill Smelkov <kirr@mns.spb.ru>
Tue, 28 Sep 2010 08:20:24 +0000 (12:20 +0400)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Sep 2010 20:21:28 +0000 (13:21 -0700)
Since we use a-b-c for mywork commits in one place, I think it would be
logical to also use a-b-c too in other illustration on this topic.

Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/user-manual.txt

index fecc4eb5b3b853f4781c769fff8337e8bb6c3500..84dfbf42ecbb8aee77bfc11d94179fdb8dbd50fa 100644 (file)
@@ -2439,9 +2439,9 @@ You have performed no merges into mywork, so it is just a simple linear
 sequence of patches on top of "origin":
 
 ................................................
- o--o--o <-- origin
+ o--o--O <-- origin
         \
-         o--o--o <-- mywork
+        a--b--c <-- mywork
 ................................................
 
 Some more interesting work has been done in the upstream project, and