On Wed, Oct 5, 2011 at 10:52 AM, Nicolas Dichtel <nicolas.dichtel@xxxxxxxxx> wrote: > 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. Please do the following with 1.7.6.4: # ls .git # git cherry-pick 3f78d1f210ff89af77f042ab7f4a8fee39feb1c9 # ls .git # git cat-file -p 3f78d1f210ff89af77f042ab7f4a8fee39feb1c9 # git cat-file -p HEAD And send the transcript. Thanks. j. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html