mirror of
https://github.com/mhagger/git-imerge.git
synced 2024-09-11 15:16:16 +03:00
Fix the diagram for rebase-with-history.
The "branch" reference should be moved, not the "master" reference. Reported-by: Christoffer Hammarström
This commit is contained in:
parent
1c8c85e721
commit
3bc89fb280
@ -1030,7 +1030,7 @@ Simplifying the results (cont'd)
|
||||
|
||||
::
|
||||
|
||||
o - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11
|
||||
o - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 ← master
|
||||
| |
|
||||
A ---------------------------------------------------- A11'
|
||||
| |
|
||||
@ -1044,10 +1044,10 @@ Simplifying the results (cont'd)
|
||||
| |
|
||||
F ---------------------------------------------------- F11'
|
||||
| |
|
||||
G ---------------------------------------------------- G11' ← master
|
||||
G ---------------------------------------------------- G11'
|
||||
|
||||
↑
|
||||
branch
|
||||
↑
|
||||
branch
|
||||
|
||||
.. class:: incremental
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user