From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: "Karl Hasselström" <kha@treskal.com>
Cc: Michel Marti <mma@objectxp.com>, Git Mailing List <git@vger.kernel.org>
Subject: Re: Mixing cherry-pick and merge
Date: Wed, 29 Aug 2007 14:22:32 +0100 (BST) [thread overview]
Message-ID: <Pine.LNX.4.64.0708291422020.28586@racer.site> (raw)
In-Reply-To: <20070829131439.GA31212@diana.vm.bytemark.co.uk>
Hi,
On Wed, 29 Aug 2007, Karl Hasselstr?m wrote:
> On 2007-08-29 14:05:55 +0200, Michel Marti wrote:
>
> > I just merged from a branch from which I previously cherry-picked some
> > commits and now the log contains the already cherry-picked commits
> > twice (which is rather confusing). Is this a bug or a feature?
>
> It's an inevitable consequence of git's design. When you cherry-pick a
> commit, you create a (maybe slightly modified) copy of it with different
> ancestry. If you then merge a branch that contains the original commit,
> you will get both the original and the copy as ancestors of your new
> merge commit.
I guess that people are not even aware that they can rebase with Git.
Sounds like a perfect use case to me.
Ciao,
Dscho
prev parent reply other threads:[~2007-08-29 13:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-29 12:05 Mixing cherry-pick and merge Michel Marti
2007-08-29 13:14 ` Karl Hasselström
2007-08-29 13:22 ` Johannes Schindelin [this message]
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=Pine.LNX.4.64.0708291422020.28586@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=kha@treskal.com \
--cc=mma@objectxp.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).