Re: [PATCH 0/6] am --skip/--abort: improve index/worktree cleanup

On Sat, Jun 6, 2015 at 4:46 AM, Paul Tan pyoka...@gmail.com wrote: Currently git-am attempts to clean up the index/worktree when skipping or aborting, but does not do it very well: * While it discards conflicted index entries, it does not remove any other modifications made to the index due

[PATCH 0/6] am --skip/--abort: improve index/worktree cleanup

Currently git-am attempts to clean up the index/worktree when skipping or aborting, but does not do it very well: * While it discards conflicted index entries, it does not remove any other modifications made to the index due to a previous threeway merge. * It expects HEAD/ORIG_HEAD to exist,