summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKirill Smelkov <kirr@mns.spb.ru>2010-09-28 08:20:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-09-29 20:21:28 (GMT)
commitfa8347b81609429d578bd67695bf19b096b10f4c (patch)
tree70647cb4f7f42ff7758fc406d2e6241e293df9cf
parent2bea593bf0f1159e93dbca1008a18dea4c262e58 (diff)
downloadgit-fa8347b81609429d578bd67695bf19b096b10f4c.zip
git-fa8347b81609429d578bd67695bf19b096b10f4c.tar.gz
git-fa8347b81609429d578bd67695bf19b096b10f4c.tar.bz2
user-manual: be consistent in illustrations to 'git rebase'
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>
-rw-r--r--Documentation/user-manual.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index fecc4eb..84dfbf4 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -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