summaryrefslogtreecommitdiff
path: root/path.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-08-03 10:41:34 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-08-03 10:41:34 -0700
commit29dce32f79765cb3c2ed4c3b8ef439e5e399af8e (patch)
tree1e3b6d8b67cd926af37bd4239f5e690ffa1e6f94 /path.c
parentMerge branch 'ss/clone-guess-dir-name-simplify' into maint (diff)
parentrebase -i: do not leave a CHERRY_PICK_HEAD file behind (diff)
downloadtgif-29dce32f79765cb3c2ed4c3b8ef439e5e399af8e.tar.xz
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 'path.c')
0 files changed, 0 insertions, 0 deletions