From: Junio C Hamano <gitster@pobox.com>
To: Jay Soffian <jaysoffian@gmail.com>
Cc: git@vger.kernel.org, nicolas.dichtel@6wind.com
Subject: Re: git-cherry-pick and git-commit --amend in version 1.7.6.4
Date: Wed, 05 Oct 2011 10:40:37 -0700 [thread overview]
Message-ID: <7v8voz8hgq.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <4E8C6F2F.1070306@6wind.com> (Nicolas Dichtel's message of "Wed, 05 Oct 2011 16:52:31 +0200")
Pinging Jay who may have know a thing or two from the history leading to
37f7a85 (Teach commit about CHERRY_PICK_HEAD, 2011-02-19).
Nicolas Dichtel <nicolas.dichtel@6wind.com> writes:
> Hi,
>
> still with version 1.7.6.4, when I do a cherry-pick, that succeeded, I
> cannot do a commit --amend after:
>
> # git cherry-pick 3f78d1f210ff89af77f042ab7f4a8fee39feb1c9
> [dev 1a04a23] drivers/net/usb/asix.c: Fix unaligned accesses
> 1 files changed, 33 insertions(+), 1 deletions(-)
> # echo $?
> 0
> # git commit --amend
> fatal: You are in the middle of a cherry-pick -- cannot amend.
> #
>
> The same operations (with the same patch), with version 1.7.3.4 is ok.
>
>
> Regards,
> Nicolas
next prev parent reply other threads:[~2011-10-05 17:40 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-05 14:52 git-cherry-pick and git-commit --amend in version 1.7.6.4 Nicolas Dichtel
2011-10-05 16:50 ` Jay Soffian
2011-10-06 7:37 ` Nicolas Dichtel
2011-10-06 7:53 ` Nicolas Dichtel
2011-10-06 13:09 ` Jay Soffian
2011-10-06 13:22 ` Nicolas Dichtel
2011-10-06 13:44 ` Jay Soffian
2011-10-05 17:40 ` Junio C Hamano [this message]
2011-10-05 17:43 ` Jay Soffian
2011-10-05 21:55 ` Junio C Hamano
2011-10-05 22:23 ` Jay Soffian
2011-10-05 22:32 ` Junio C Hamano
2011-10-06 0:08 ` Jay Soffian
2011-10-05 23:03 ` Junio C Hamano
2011-10-05 23:42 ` Junio C Hamano
2011-10-06 7:06 ` 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=7v8voz8hgq.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jaysoffian@gmail.com \
--cc=nicolas.dichtel@6wind.com \
/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).