Browse Source

improve rebase and cherry-pick images

Davide Alberani 6 years ago
parent
commit
5264989af8

+ 1 - 0
git-crash-course.md

@@ -757,6 +757,7 @@ Vedere anche: https://stackoverflow.com/questions/7251477/what-are-the-differenc
 
 ## Rimettere insieme i pezzi: cherry-pick
 
+    $ git checkout master
     $ git cherry-pick <commit>
     $ # in caso di conflitti:
     $ git cherry-pick --continue

BIN
images/cherry-pick.odg


BIN
images/cherry-pick.png


BIN
images/rebase-interactive.odg


BIN
images/rebase-interactive.png


BIN
images/rebase.odg


BIN
images/rebase.png