| commit | 0d1a1517835a10818f2d40d8780a268dbb5e20ce | |
| author | Eric Sunshine <sunshine@sunshineco.com> | |
| Mon, 6 Jul 2015 17:31:00 +0000 (6 13:31 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 7 Jul 2015 21:34:46 +0000 (7 14:34 -0700) | ||
| tree | 34fc59b1e3f82790f86d684513c1ba356fbed390 | treesnapshot (tar.gz zip) |
| parent | 1eb07d829f3f0992c93c6b44fdcc4e95ebab12f3 | commitdiff |
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>
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>
| Documentation/git-checkout.txt | diffblobblamehistory | |
| builtin/checkout.c | diffblobblamehistory | |
| builtin/worktree.c | diffblobblamehistory |