commit | 29dce32f79765cb3c2ed4c3b8ef439e5e399af8e | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Mon Aug 03 10:41:34 2015 -0700 |
committer | Junio C Hamano <gitster@pobox.com> | Mon Aug 03 10:41:34 2015 -0700 |
tree | 1e3b6d8b67cd926af37bd4239f5e690ffa1e6f94 | |
parent | de67af4a8fa123fff6161eb10a2ed4fd02fa1f4c [diff] | |
parent | 0e0aff4b4ca93053a83578cb040475c6e3185f2d [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