From: Adam Monsen <haircut@gmail•com>
To: git@vger•kernel.org
Subject: Re: Dangerous "git am --abort" behavior
Date: Mon, 20 Dec 2010 19:35:00 +0000 (UTC) [thread overview]
Message-ID: <loom.20101220T203122-271@post.gmane.org> (raw)
In-Reply-To: AANLkTinP4SArMkjvTXOEG=tf=8EcEdP9fPAB7F=iitSc@mail.gmail.com
Linus Torvalds writes:
> What happened today was that I had been doing a pull or two, and then
> applied an emailed patch with "git am" as usual. But as sometimes
> happens, I actually had a previous "git am" that had failed - in fact,
> it was the same patch that I applied today that had had an earlier
> version that no longer applied.
It would be helpful if "git status" mentioned if a rebase or am operation is in
progress... this might have helped you avoid the situation described.
next prev parent reply other threads:[~2010-12-20 19:35 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-20 18:31 Dangerous "git am --abort" behavior Linus Torvalds
2010-12-20 19:35 ` Adam Monsen [this message]
2010-12-20 21:52 ` Drew Northup
2010-12-20 22:04 ` Adam Monsen
2010-12-23 22:06 ` Steven E. Harris
2010-12-23 22:32 ` Junio C Hamano
2010-12-24 0:24 ` Steven E. Harris
2010-12-21 0:30 ` Junio C Hamano
2010-12-21 18:29 ` Junio C Hamano
2010-12-21 18:46 ` Linus Torvalds
2010-12-21 18:47 ` Junio C Hamano
2010-12-22 9:49 ` Peter Krefting
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=loom.20101220T203122-271@post.gmane.org \
--to=haircut@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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