From: "Rafael Garcia-Suarez" <rgarciasuarez@gmail.com>
To: "Jean-Baptiste Quenot" <jbq@caraldi.com>
Cc: git@vger.kernel.org
Subject: Re: Recording cherry-picked commits
Date: Sat, 22 Mar 2008 23:48:32 +0100 [thread overview]
Message-ID: <b77c1dce0803221548x3250cb90taa9a9d53464f7ea7@mail.gmail.com> (raw)
In-Reply-To: <ae63f8b50803220937k78571fbdl1eeb60966ec7aa40@mail.gmail.com>
On 22/03/2008, Jean-Baptiste Quenot <jbq@caraldi.com> wrote:
> What about using a hidden ".gitcherry" file in the current branch to
> store the commits that have been applied? With the simple shell
> scripts below I'm able to achieve the same effect as svnmerge:
(.gitcherry should really be at the root of the git repository, not in
the current directory)
What happens to .gitcherry across merges ? I think your solution isn't
robust enough.
Here's an alternate idea: store the original sha1 in the commit
message, via a custom header (something like X-Cherry-Picked-From) at
least in case of conflict, and have git-cherry recognize it.
(I have the same problem as you, by the way, and would really like to
see it solved one way or another.)
next prev parent reply other threads:[~2008-03-22 22:49 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-21 12:33 Recording cherry-picked commits Jean-Baptiste Quenot
2008-03-22 16:37 ` Jean-Baptiste Quenot
2008-03-22 22:48 ` Rafael Garcia-Suarez [this message]
2008-03-23 0:37 ` Junio C Hamano
2008-03-23 11:07 ` Jean-Baptiste Quenot
2008-03-23 12:11 ` Johannes Schindelin
2008-03-23 13:57 ` Rafael Garcia-Suarez
2008-03-23 14:12 ` Johannes Schindelin
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=b77c1dce0803221548x3250cb90taa9a9d53464f7ea7@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).