git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0e521a4 0e0aff4)
Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip'
authorJunio C Hamano <redacted>
Mon, 13 Jul 2015 21:00:25 +0000 (14:00 -0700)
committerJunio C Hamano <redacted>
Mon, 13 Jul 2015 21:00:25 +0000 (14:00 -0700)
commite01787f1a1de589b7adc6f6946b53996a5e74c34
tree470370b475717ef3a0fc878e67d399a1b5d2525ftree | snapshot
parent0e521a41b526f6dbde76030ca7e7c1107115c120commit | diff
parent0e0aff4b4ca93053a83578cb040475c6e3185f2dcommit | diff
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
git-rebase--interactive.sh diff1 | diff2 | blob | history
t/t3404-rebase-interactive.sh diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT