Merge branch 'mg/replace-resolve-delete' into next
commitfa785aef7657aef8864f1abc4e5f0f7c0e1baa98
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Nov 2012 22:01:01 +0000 (14 14:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Nov 2012 22:01:02 +0000 (14 14:01 -0800)
treed7efb6300c1cedc3a7f811392fe948f61b1750cf
parent7230f260ad5a5adae154978eccf30aa4bdf701c0
parent9dfc36841b3f1a2669f0513676cc4d72ef1220a1
Merge branch 'mg/replace-resolve-delete' into next

Be more user friendly to people using "git replace -d".

* mg/replace-resolve-delete:
  replace: parse revision argument for -d