Junio C Hamano wrote:
>     $ git am ;# no input file
>     ^C
>     $ git am --abort
>     Resolve operation not in progress, we are not resuming.

I tried it on git 1.8.3, and this only incidentally "seems" to half-work (?)

% git am
% git am --abort
cat: /home/artagnon/src/git/.git/rebase-apply/next: No such file or directory
% git status
# On branch master
# Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded.
nothing to commit, working directory clean

In the process of aborting, it blew away one commit!

> I think this is a recent breakage after merging the topic to add
> "rebase --autostash", but I haven't looked into it yet.

Yes, I can confirm that my topic introduced this bug, and I apologize
for not having caught it.  I'm looking into the problem.

To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to