summaryrefslogtreecommitdiff
path: root/builtin/check-mailmap.c
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
commita4127142c621c03cb0967d298ac0ea1e673162fd (patch)
treee6383127a5b555b4637c1100da78c0168276623a /builtin/check-mailmap.c
parentMerge branch 'jk/check-repository-format' into maint (diff)
parentbranch -d: refuse deleting a branch which is currently checked out (diff)
downloadtgif-a4127142c621c03cb0967d298ac0ea1e673162fd.tar.xz
Merge branch 'ky/branch-d-worktree' into maint
When "git worktree" feature is in use, "git branch -d" allowed deletion of a branch that is checked out in another worktree * ky/branch-d-worktree: branch -d: refuse deleting a branch which is currently checked out
Diffstat (limited to 'builtin/check-mailmap.c')
0 files changed, 0 insertions, 0 deletions