git-am: make it easier after fixing up an unapplicable patch.