diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-03 10:41:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-03 10:41:34 -0700 |
| commit | 29dce32f79765cb3c2ed4c3b8ef439e5e399af8e (patch) | |
| tree | 1e3b6d8b67cd926af37bd4239f5e690ffa1e6f94 /GIT-VERSION-GEN | |
| parent | de67af4a8fa123fff6161eb10a2ed4fd02fa1f4c (diff) | |
| parent | 0e0aff4b4ca93053a83578cb040475c6e3185f2d (diff) | |
| download | git-29dce32f79765cb3c2ed4c3b8ef439e5e399af8e.tar.gz | |
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
Diffstat (limited to 'GIT-VERSION-GEN')
0 files changed, 0 insertions, 0 deletions