mhagger/git-imerge
1
1
Fork 0
mirror of https://github.com/mhagger/git-imerge.git synced 2024-09-11 15:16:16 +03:00
Code Issues Projects Releases Wiki Activity

Fix the diagram for rebase-with-history.

Browse Source 
The "branch" reference should be moved, not the "master" reference.

Reported-by: Christoffer Hammarström
This commit is contained in:
Michael Haggerty 2013-07-15 10:42:52 +02:00
parent 1c8c85e721
commit 3bc89fb280
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/presentations/GitMerge-2013/talk.rst
View File

@ -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