| commit | 08092082b7ba6435662310a945c7c96e42278f0a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 20 Sep 2013 19:29:57 +0000 (20 12:29 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 20 Sep 2013 19:29:58 +0000 (20 12:29 -0700) | ||
| tree | 426a2114be21571015d813c5f48b393b978753d6 | treesnapshot (tar.gz zip) |
| parent | 6d3e1f2e453f7473d4ab64ef378309958613c5d7 | commitdiff |
| parent | 182d7dc46b23b4a20985c93ea3a6ba3e6f267ff6 | commitdiff |
Merge branch 'hu/cherry-pick-previous-branch'
Just like "git checkout -" knows to check out and "git merge -"
knows to merge the branch you were previously on, "git cherry-pick"
now understands "git cherry-pick -" to pick from the previous
branch.
* hu/cherry-pick-previous-branch:
cherry-pick: allow "-" as abbreviation of '@{-1}'
Just like "git checkout -" knows to check out and "git merge -"
knows to merge the branch you were previously on, "git cherry-pick"
now understands "git cherry-pick -" to pick from the previous
branch.
* hu/cherry-pick-previous-branch:
cherry-pick: allow "-" as abbreviation of '@{-1}'
| builtin/revert.c | diff1 | diff2 | blobhistory |
| t/t3501-revert-cherry-pick.sh | diff1 | diff2 | blobhistory |