summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Eric Sunshine <sunshine@sunshineco.com>2015-07-17 18:59:57 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-07-20 11:29:24 -0700
commite13d37094e3b2ceb51dab362b8e2e1ad9e4bb758 (patch)
tree303b513fed860c9066092b3178ad0419e713c274 /git-mergetool.sh
parentcheckout: avoid resolving HEAD unnecessarily (diff)
downloadtgif-e13d37094e3b2ceb51dab362b8e2e1ad9e4bb758.tar.xz
checkout: name check_linked_checkouts() more meaningfully
check_linked_checkouts() doesn't just "check" linked checkouts for "something"; specifically, it aborts the operation if the branch about to be checked out is already checked out elsewhere. Therefore, rename it to die_if_checked_out() to give a better indication of its function. The more meaningful name will be particularly important when this function is later published for use by other callers. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions