diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-05-02 14:24:05 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-05-02 14:24:05 -0700 |
commit | a4127142c621c03cb0967d298ac0ea1e673162fd (patch) | |
tree | e6383127a5b555b4637c1100da78c0168276623a /git-gui/lib/branch.tcl | |
parent | 85916549980c709ae14f8a935a5a6266a4a80b26 (diff) | |
parent | f292244c04d8109ee32a45016ce08984fbd925f0 (diff) | |
download | git-a4127142c621c03cb0967d298ac0ea1e673162fd.tar.gz git-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 'git-gui/lib/branch.tcl')
0 files changed, 0 insertions, 0 deletions