| commit | c925fe23684455735c3bb1903803643a24a58d8f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 12 Jul 2015 16:38:21 +0000 (12 09:38 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 12 Jul 2015 16:38:21 +0000 (12 09:38 -0700) | ||
| tree | 300efa4a8e232730a677a9337d591d12388eebaa | treesnapshot (tar.gz zip) |
| parent | 0d1a1517835a10818f2d40d8780a268dbb5e20ce | commitdiff |
Revert "checkout: retire --ignore-other-worktrees in favor of --force"
This reverts commit 0d1a1517835a10818f2d40d8780a268dbb5e20ce.
When trying to switch to a different branch, that happens to be
checked out in another working tree, the user shouldn't have to
give up the other safety measures (like protecting the local changes
that overlap the difference between the branches) while defeating
the "no two checkouts of the same branch" safety.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This reverts commit 0d1a1517835a10818f2d40d8780a268dbb5e20ce.
When trying to switch to a different branch, that happens to be
checked out in another working tree, the user shouldn't have to
give up the other safety measures (like protecting the local changes
that overlap the difference between the branches) while defeating
the "no two checkouts of the same branch" safety.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-checkout.txt | diffblobblamehistory | |
| builtin/checkout.c | diffblobblamehistory | |
| builtin/worktree.c | diffblobblamehistory |