From fa8347b81609429d578bd67695bf19b096b10f4c Mon Sep 17 00:00:00 2001 From: Kirill Smelkov Date: Tue, 28 Sep 2010 12:20:24 +0400 Subject: 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 Signed-off-by: Junio C Hamano --- Documentation/user-manual.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Documentation/user-manual.txt') diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index fecc4eb5b3..84dfbf42ec 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 -- cgit v1.2.3