summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2011-02-08 04:29:09 -0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-02-08 11:14:25 -0800
commit09ebad6faeec11c3dbad0bdaf95faed57be5dcba (patch)
tree0b99f3e776457c30af4953e55e7c7c2eadc85194 /git-mergetool.sh
parentcheckout: fix bug with ambiguous refs (diff)
downloadtgif-09ebad6faeec11c3dbad0bdaf95faed57be5dcba.tar.xz
checkout: split off a function to peel away branchname arg
The code to parse and consume the tree name and "--" in commands such as "git checkout @{-1} -- '*.c'" is intimidatingly long. Split it out into a separate function and make it easier to skip on first reading by making the data it uses and produces more explicit. No functional change intended. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions