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)
commit89cd2373ea914e9656f169b315c4d758dfdcf07e
treea9a7c01392ee432fca15e421d995a5b5f9886e82
parent65bc83d704b82b613f1f61b4ad97412376ab4a69
parent4e8115fff135a09f75020083f51722e7e35eb6e9
Merge branch 'jc/merge-dash-previous'

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