summaryrefslogtreecommitdiff
path: root/diffcore-pickaxe.c
diff options
context:
space:
mode:
authorLibravatar Eric Sunshine <sunshine@sunshineco.com>2015-07-06 13:31:00 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-07-07 14:34:46 -0700
commit0d1a1517835a10818f2d40d8780a268dbb5e20ce (patch)
tree34fc59b1e3f82790f86d684513c1ba356fbed390 /diffcore-pickaxe.c
parentworktree: add: auto-vivify new branch when <branch> is omitted (diff)
downloadtgif-0d1a1517835a10818f2d40d8780a268dbb5e20ce.tar.xz
checkout: retire --ignore-other-worktrees in favor of --force
As a safeguard, checking out a branch already checked out by a different worktree is disallowed. This behavior can be overridden with --ignore-other-worktrees, however, this option is neither obvious nor particularly discoverable. As a common safeguard override, --force is more likely to come to mind. Therefore, overload it to also suppress the check for a branch already checked out elsewhere. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diffcore-pickaxe.c')
0 files changed, 0 insertions, 0 deletions