summaryrefslogtreecommitdiff
path: root/xdiff-interface.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-05-02 14:24:05 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-05-02 14:24:05 -0700
commit3c383a30c854232b2a678110dd191b639a8b7989 (patch)
tree2cb164e470ca962978422638f86e42899c4fb23b /xdiff-interface.h
parentMerge branch 'ky/branch-d-worktree' into maint (diff)
parentset_worktree_head_symref(): fix error message (diff)
downloadtgif-3c383a30c854232b2a678110dd191b639a8b7989.tar.xz
Merge branch 'ky/branch-m-worktree' into maint
When "git worktree" feature is in use, "git branch -m" renamed a branch that is checked out in another worktree without adjusting the HEAD symbolic ref for the worktree. * ky/branch-m-worktree: set_worktree_head_symref(): fix error message branch -m: update all per-worktree HEADs refs: add a new function set_worktree_head_symref
Diffstat (limited to 'xdiff-interface.h')
0 files changed, 0 insertions, 0 deletions