Permalink
Browse files

Updated rebase transplant graphics to show orig now-unreachable commits

  • Loading branch information...
1 parent 627118c commit 27bd359e8379c5cd635fe74719516d5b0d2aa44e @whiteinge committed Jul 31, 2012
View
BIN cars_2012-04-27_git/img/transplant.pdf
Binary file not shown.
View
BIN cars_2012-04-27_git/img/transplanted.pdf
Binary file not shown.
View
BIN cars_2012-04-27_git/presentation.pdf
Binary file not shown.
View
18 cars_2012-04-27_git/presentation.rst
@@ -809,28 +809,26 @@ Demonstration
% git init testrepo
- % cd ./testrepo
+ % cd testrepo
- % for commit in A B C; do touch $commit && git add $commit && git commit -m "Added $commit" && git tag $commit; done
+ % for commit in A B C; do touch $commit && git add $commit && git commit -m "Added $commit"; done
- % git checkout -b featureA B
+ % git checkout -b featureA HEAD~1
- % for commit in D E F; do touch $commit && git add $commit && git commit -m "Added $commit" && git tag $commit; done
+ % for commit in D E F; do touch $commit && git add $commit && git commit -m "Added $commit"; done
- % git checkout -b featureB E
+ % git checkout -b featureB HEAD~1
- % for commit in G H; do touch $commit && git add $commit && git commit -m "Added $commit" && git tag $commit; done
+ % for commit in G H; do touch $commit && git add $commit && git commit -m "Added $commit"; done
% git graph-dag master featureA featureB | dot -Tpng | display
- % git rebase --onto master E featureB
+ % git rebase --onto master HEAD~2 featureB
First, rewinding head to replay your work on top of it...
Applying: Added G
Applying: Added H
- % git graph-dag master featureA featureB | dot -Tpng | display
-
- % git graph-dag master featureA featureB H -- | dot -Tpng | display
+ % git graph-dag master featureA featureB ORIG_HEAD | dot -Tpng | display
Demonstration
-------------

0 comments on commit 27bd359

Please sign in to comment.