Merge branch 'mg/replace-resolve-delete'
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Nov 2012 18:38:32 +0000 (10:38 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Nov 2012 18:38:32 +0000 (10:38 -0800)
commit3a2c08238326a219ce9d7e53d95e382ed3fb8b7c
tree43059b26f7ba14a7493bdefc37894a47bb9c5aaa
parent79a09bba1cc919f5ea0992db358fb4b14ab2c226
parent9dfc36841b3f1a2669f0513676cc4d72ef1220a1
Merge branch 'mg/replace-resolve-delete'

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

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