Merge branch 'jc/merge-dash-previous' into next
commit06480d1d4e87c4295d7654c3b82f70cf78f98bba
authorJunio C Hamano <gitster@pobox.com>
Mon, 11 Apr 2011 23:14:50 +0000 (11 16:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 Apr 2011 23:14:50 +0000 (11 16:14 -0700)
tree396a75bec0ddd6aea3b6dbfcfd36898d1228914d
parent8349531834b58506186788eb6b0e3bc5f52610eb
parent4e8115fff135a09f75020083f51722e7e35eb6e9
Merge branch 'jc/merge-dash-previous' into next

* jc/merge-dash-previous:
  merge: allow "-" as a short-hand for "previous branch"