From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Ramkumar Ramachandra <artagnon@gmail.com>
Subject: [Bug?] "am --abort" broken?
Date: Wed, 12 Jun 2013 15:38:02 -0700 [thread overview]
Message-ID: <7vsj0nymyd.fsf@alter.siamese.dyndns.org> (raw)
This is somewhat minor but will confuse people who do not know how
to manually recover from. Start "am" without giving an input file
by mistake:
$ git am ;# no input file
^C
At this point, you are still in "am" session; completion will tell
you that you are in a middle of "am/rebase". A more recent way to
get out of this is to use "am --abort", but you get this:
$ git am --abort
Resolve operation not in progress, we are not resuming.
"git am" from 'maint' will help you get out of it, or you can do it
the old fashioned way:
$ rm -fr .git/rebase-apply
I think this is a recent breakage after merging the topic to add
"rebase --autostash", but I haven't looked into it yet.
next reply other threads:[~2013-06-12 22:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-12 22:38 Junio C Hamano [this message]
2013-06-13 4:00 ` [Bug?] "am --abort" broken? Ramkumar Ramachandra
2013-06-13 4:17 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vsj0nymyd.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).