add a stop, abort, or similar command

[jacob-keller]

git rebase and git merge both have "--abort" and "--quit" options for stopping a merge. The git imerge tool does not seem to have a similar option or command.

It would be nice if the tool had an analagous way to say "give up for now". It would also help to have documentation that shows how to resume a merge you stopped earlier.

[jacob-keller]

It seems like I can do a "git merge --abort" or "git merge --quit" but it would be good if imerge had this as a command.

[waldyrious]

It would also help to have documentation that shows how to resume a merge you stopped earlier.

You can find that here: https://github.com/mhagger/git-imerge#suspendingresuming

That section also mentions how to abort an imerge, although I agree it could be made more convenient and straightforward.

[mhagger]

I use git imerge remove. But this leaves you in a detached-HEAD state, so you have to follow it up with git checkout SOMEBRANCH. It would be nice if this were a single step, like git imerge abort, though then imerge would have to decide what branch to return you to. I don't remember if it already records that.

[waldyrious]

Oh, by the way, this seems to be a duplicate of #123. WDYT, @jacob-keller?

[jacob-keller]

Yep that looks like a duplicate.

[LemmingAvalanche]

I use git imerge remove. But this leaves you in a detached-HEAD state,

I think it would be nice to have an alias abort which just uses that. Being left in that state is a papercut compared to the improvement of having a more standard command.