summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorLibravatar Felipe Contreras <felipe.contreras@gmail.com>2013-09-02 01:34:30 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-09-12 14:39:34 -0700
commit9ba89f484e023827eca6ad44baf69af37dac4db3 (patch)
tree412e36de2f9e033c1705bed8d21ed7aac3ad379f /git-mergetool--lib.sh
parentsha1-name: pass len argument to interpret_branch_name() (diff)
downloadtgif-9ba89f484e023827eca6ad44baf69af37dac4db3.tar.xz
Add new @ shortcut for HEAD
Typing 'HEAD' is tedious, especially when we can use '@' instead. The reason for choosing '@' is that it follows naturally from the ref@op syntax (e.g. HEAD@{u}), except we have no ref, and no operation, and when we don't have those, it makes sens to assume 'HEAD'. So now we can use 'git show @~1', and all that goody goodness. Until now '@' was a valid name, but it conflicts with this idea, so let's make it invalid. Probably very few people, if any, used this name. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions