On Sat, Jun 6, 2015 at 4:46 AM, Paul Tan <pyokagan@xxxxxxxxx> 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 to a previous threeway merge. > > * It expects HEAD/ORIG_HEAD to exist, and thus does not clean up the index when > on an unborn branch. > > This patch series addresses the above two general problems by making the calls > to git-read-tree aware of the differences between our current index and > HEAD/ORIG_HEAD, and by explictly defining what happens when we are on an unborn > branch. > > > Paul Tan (6): > am --skip: revert changes introduced by failed 3way merge > am -3: support 3way merge on unborn branch > am --skip: support skipping while on unborn branch > am --abort: revert changes introduced by failed 3way merge > am --abort: support aborting to unborn branch > am --abort: keep unrelated commits on unborn branch The whole series looks good to me. Thanks, Stefan > > git-am.sh | 31 ++++++++++++++------ > t/t4151-am-abort.sh | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 104 insertions(+), 8 deletions(-) > > -- > 2.1.4 > -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html