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