Skip to content
Browse files

use loosely dashed lines instead of deltas

The delta notation for cherry picking / rebasing was a little confusing
and did not go with the rest of the diagrams.  So, instead, use loosely
dashed lines to represent a cherry pick.  I'm still not thrilled with
this, but I think it's an improvement.
  • Loading branch information...
1 parent ee586f7 commit c41c7ec1166c9863caa230c4a701ba1ca1c5a8a7 @MarkLodato committed Mar 10, 2010
Showing with 7 additions and 20 deletions.
  1. +2 −6 cherry-pick.tex
  2. +2 −6 rebase-onto.tex
  3. +3 −8 rebase.tex
View
8 cherry-pick.tex
@@ -16,15 +16,11 @@
\node [cmd] at (0, 3.75) {git cherry-pick 2c33a};
- \path [line, auto=left]
- (1) edge [bend left=20] node {$\Delta_1$} (2)
- (E) edge [bend left=20] node {$\Delta_1$} (F)
- ;
-
\path [line]
- (F) edge [bend left=15] (index)
+ (F) edge [bend left=20] (index)
(F) edge [bend left=30] (work)
(old HEAD) edge [dashed, bend left=50] (HEAD)
+ (2) edge [loosely dashed, bend right=35] (F)
;
\end{tikzpicture}
View
8 rebase-onto.tex
@@ -21,15 +21,11 @@
\node [cmd,right] at (1, 3.75) {git rebase --onto master 169a6};
- \path [line, auto=left]
- (1) edge [bend left=20] node {$\Delta_1$} (2)
- (D) edge [bend left=20] node {$\Delta_1$} (E)
- ;
-
\path [line]
- (E) edge [bend left=15] (index)
+ (E) edge [bend left=20] (index)
(E) edge [bend left=30] (work)
(old HEAD label) edge [dashed, bend left=10] (HEAD label)
+ (2) edge [loosely dashed, bend right=40] (E)
;
\end{tikzpicture}
View
11 rebase.tex
@@ -22,17 +22,12 @@
\node [cmd,right] at (1, 3.75) {git rebase master};
- \path [line, auto=left]
- (A) edge [bend left=20] node {$\Delta_1$} (1)
- (1) edge [bend left=20] node {$\Delta_2$} (2)
- (D) edge [bend left=20] node {$\Delta_1$} (E)
- (E) edge [bend left=20] node {$\Delta_2$} (F)
- ;
-
\path [line]
- (F) edge [bend left=15] (index)
+ (F) edge [bend left=20] (index)
(F) edge [bend left=30] (work)
(old HEAD label) edge [dashed, bend left=10] (HEAD label)
+ (1) edge [loosely dashed, bend right=35] (E)
+ (2) edge [loosely dashed, bend left=30] (F)
;
\end{tikzpicture}

0 comments on commit c41c7ec

Please sign in to comment.
Something went wrong with that request. Please try again.