| commit | e01787f1a1de589b7adc6f6946b53996a5e74c34 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 13 Jul 2015 21:00:25 +0000 (13 14:00 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 13 Jul 2015 21:00:25 +0000 (13 14:00 -0700) | ||
| tree | 470370b475717ef3a0fc878e67d399a1b5d2525f | treesnapshot (tar.gz zip) |
| parent | 0e521a41b526f6dbde76030ca7e7c1107115c120 | commitdiff |
| parent | 0e0aff4b4ca93053a83578cb040475c6e3185f2d | commitdiff |
Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip'
Abandoning an already applied change in "git rebase -i" with
"--continue" left CHERRY_PICK_HEAD and confused later steps.
* js/rebase-i-clean-up-upon-continue-to-skip:
rebase -i: do not leave a CHERRY_PICK_HEAD file behind
t3404: demonstrate CHERRY_PICK_HEAD bug
Abandoning an already applied change in "git rebase -i" with
"--continue" left CHERRY_PICK_HEAD and confused later steps.
* js/rebase-i-clean-up-upon-continue-to-skip:
rebase -i: do not leave a CHERRY_PICK_HEAD file behind
t3404: demonstrate CHERRY_PICK_HEAD bug
| git-rebase--interactive.sh | diff1 | diff2 | blobhistory |
| t/t3404-rebase-interactive.sh | diff1 | diff2 | blobhistory |