summaryrefslogtreecommitdiff
path: root/xdiff/xtypes.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-09-10 17:08:23 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-09-10 17:08:24 +0900
commit79553b94f966f3cec6156a68001650ca26a584c4 (patch)
tree37c0d1de2d26a28d67e06993819e8965dd25e942 /xdiff/xtypes.h
parentMerge branch 'mm/send-email-cc-cruft' (diff)
parentbranch: fix branch renaming not updating HEADs correctly (diff)
downloadtgif-79553b94f966f3cec6156a68001650ca26a584c4.tar.xz
Merge branch 'nd/worktree-kill-parse-ref'
"git branch -M a b" while on a branch that is completely unrelated to either branch a or branch b misbehaved when multiple worktree was in use. This has been fixed. * nd/worktree-kill-parse-ref: branch: fix branch renaming not updating HEADs correctly
Diffstat (limited to 'xdiff/xtypes.h')
0 files changed, 0 insertions, 0 deletions