summaryrefslogtreecommitdiff
path: root/contrib/examples/git-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2014-11-30 15:24:49 +0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-12-01 11:00:17 -0800
commit5883034c61c60e04db16520a759ec67a34ffaea3 (patch)
tree21ab4cc9c42663e5ae792a4ae07f53954550cbcf /contrib/examples/git-resolve.sh
parentprune: strategies for linked checkouts (diff)
downloadtgif-5883034c61c60e04db16520a759ec67a34ffaea3.tar.xz
checkout: reject if the branch is already checked out elsewhere
One branch obviously can't be checked out at two places (but detached heads are ok). Give the user a choice in this case: --detach, -b new-branch, switch branch in the other checkout first or simply 'cd' and continue to work there. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/examples/git-resolve.sh')
0 files changed, 0 insertions, 0 deletions