Merge branch 'jc/merge-dash-previous'
authorJunio C Hamano <gitster@pobox.com>
Wed, 27 Apr 2011 18:36:42 +0000 (11:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Apr 2011 18:36:42 +0000 (11:36 -0700)
* jc/merge-dash-previous:
  merge: allow "-" as a short-hand for "previous branch"


Trivial merge