git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: de67af4 0e0aff4)
Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' into maint
authorJunio C Hamano <redacted>
Mon, 3 Aug 2015 17:41:34 +0000 (10:41 -0700)
committerJunio C Hamano <redacted>
Mon, 3 Aug 2015 17:41:34 +0000 (10:41 -0700)
commit29dce32f79765cb3c2ed4c3b8ef439e5e399af8e
tree1e3b6d8b67cd926af37bd4239f5e690ffa1e6f94tree | snapshot
parentde67af4a8fa123fff6161eb10a2ed4fd02fa1f4ccommit | diff
parent0e0aff4b4ca93053a83578cb040475c6e3185f2dcommit | diff
Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' into maint

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