diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-09-20 12:29:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-20 12:29:58 -0700 |
| commit | 08092082b7ba6435662310a945c7c96e42278f0a (patch) | |
| tree | 426a2114be21571015d813c5f48b393b978753d6 /mergetools/codecompare | |
| parent | Merge branch 'mm/status-without-comment-char' (diff) | |
| parent | cherry-pick: allow "-" as abbreviation of '@{-1}' (diff) | |
| download | tgif-08092082b7ba6435662310a945c7c96e42278f0a.tar.xz | |
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}'
Diffstat (limited to 'mergetools/codecompare')
0 files changed, 0 insertions, 0 deletions