summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-04-07 15:57:57 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-04-07 15:57:57 -0700
commit4e8115fff135a09f75020083f51722e7e35eb6e9 (patch)
treebf18c33fdae0c043d1918cc93c7042e06e095140 /Makefile
parentgit-p4: replace each tab with 8 spaces for consistency (diff)
downloadtgif-4e8115fff135a09f75020083f51722e7e35eb6e9.tar.xz
merge: allow "-" as a short-hand for "previous branch"
Just like "git checkout -" is a short-hand for "git checkout @{-1}" to conveniently switch back to the previous branch, "git merge -" is a short-hand for "git merge @{-1}" to conveniently merge the previous branch. It will allow me to say: $ git checkout -b au/topic $ git am -s ./+au-topic.mbox $ git checkout pu $ git merge - which is an extremely typical and repetitive operation during my git day. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions