summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-07-12 09:38:21 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-07-12 09:38:21 -0700
commitc925fe23684455735c3bb1903803643a24a58d8f (patch)
tree300efa4a8e232730a677a9337d591d12388eebaa /Documentation/git-merge-file.txt
parentcheckout: retire --ignore-other-worktrees in favor of --force (diff)
downloadtgif-c925fe23684455735c3bb1903803643a24a58d8f.tar.xz
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>
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions