From: "Rafael Garcia-Suarez" <rgarciasuarez@gmail.com>
To: "Jean-Baptiste Quenot" <jbq@caraldi.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] git-cherry-pick -x works with conflicting commits
Date: Mon, 24 Mar 2008 15:52:57 +0100 [thread overview]
Message-ID: <b77c1dce0803240752s29e611aay55c4021741de598a@mail.gmail.com> (raw)
In-Reply-To: <ae63f8b50803240655k5d6413e5s8d6ceebca462370f@mail.gmail.com>
On 24/03/2008, Jean-Baptiste Quenot <jbq@caraldi.com> wrote:
> When I'm using "git commit -c <id>" as suggested by git-cherry-pick
> upon conflict, I do not get the mention "(cherry picked from commit
> <id>)", at least with version 1.5.4.1. How did you get it?
I use the most recent git from master, and simply do git-add and
git-commit without arguments after having resolving the conflict. The
commit message in MERGE_MSG, that I checked, does have the "cherry
picked from commit <id>" mention (before the conflict list).
next prev parent reply other threads:[~2008-03-24 14:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-24 10:41 [PATCH] git-cherry-pick -x works with conflicting commits Rafael Garcia-Suarez
2008-03-24 13:55 ` Jean-Baptiste Quenot
2008-03-24 14:52 ` Rafael Garcia-Suarez [this message]
2008-03-24 18:32 ` Jean-Baptiste Quenot
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=b77c1dce0803240752s29e611aay55c4021741de598a@mail.gmail.com \
--to=rgarciasuarez@gmail.com \
--cc=git@vger.kernel.org \
--cc=jbq@caraldi.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).