tree bf18c33fdae0c043d1918cc93c7042e06e095140
parent c3f6163b0b6e2cfae1422050c9607db1130cded0
author Junio C Hamano <gitster@pobox.com> 1302217077 -0700
committer Junio C Hamano <gitster@pobox.com> 1302217077 -0700

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>