improve rebase and cherry-pick images

2017-08-30 22:29:49 +02:00 · 2017-08-30 22:29:49 +02:00 · 5264989af8
commit 5264989af8
parent 334bc66c34
7 changed files with 1 additions and 0 deletions
--- a/git-crash-course.md
+++ b/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
--- a/images/cherry-pick.odg
+++ b/images/cherry-pick.odg
--- a/images/cherry-pick.png
+++ b/images/cherry-pick.png
--- a/images/rebase-interactive.odg
+++ b/images/rebase-interactive.odg
--- a/images/rebase-interactive.png
+++ b/images/rebase-interactive.png
--- a/images/rebase.odg
+++ b/images/rebase.odg
--- a/images/rebase.png
+++ b/images/rebase.png