From: Jonathan Nieder <jrnieder@gmail.com>
To: Andrew Pimlott <andrew@pimlott.net>
Cc: git <git@vger.kernel.org>,
"Frédéric Brière" <fbriere@fbriere.net>,
"Michael J Gruber" <git@drmicha.warpmail.net>,
"Jeff King" <peff@peff.net>,
"Björn Steinbrink" <B.Steinbrink@gmx.de>
Subject: Re: [PATCH] Documentation: 'cherry' does not cope well with merges from upstream
Date: Thu, 1 Jul 2010 20:04:00 -0500 [thread overview]
Message-ID: <20100702010400.GA6058@burratino> (raw)
In-Reply-To: <20100701210919.GA4283@burratino>
Jonathan Nieder wrote:
> +'git cherry' does not cope well with merges from upstream on the
> +working branch. Any commits after the original fork point and
> +before the latest merge from upstream will be reported as not found
> +in <upstream>.
> +
> + ____*____*____*_____*__> <upstream>
> + / \
> + original fork point \
> + \__+__+__+__+__+__+__+__*_> <head>
> +
> +While these commits are part of upstream..head, their upstream
> +counterparts are not in head..upstream.
As Junio mentioned, the text and diagram are hard to reconcile since
“these commits” are not clearly explained to be “the commits after the
original fork point and before the latest merge, marked with a +”.
Actually, the whole text is kind of awkward, which is why I left this
hanging for so long[1]. Sorry.
Adding “(marked +)” after “these commits” sounds reasonable to me as
a quick fix.
[1] http://bugs.debian.org/575577
next prev parent reply other threads:[~2010-07-02 1:04 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-01 19:38 git cherry not marking commits with equivalent upstream Andrew Pimlott
2010-07-01 19:40 ` Andrew Pimlott
2010-07-01 20:41 ` Björn Steinbrink
2010-07-01 21:17 ` Andrew Pimlott
2010-07-01 21:09 ` [PATCH] Documentation: 'cherry' does not cope well with merges from upstream Jonathan Nieder
2010-07-01 21:33 ` Andrew Pimlott
2010-07-01 21:35 ` Jonathan Nieder
2010-07-01 23:52 ` Junio C Hamano
2010-07-02 0:51 ` Jonathan Nieder
2010-07-02 1:04 ` Jonathan Nieder [this message]
2010-07-02 7:46 ` Michael J Gruber
2010-07-02 8:18 ` Jonathan Nieder
2010-07-02 9:23 ` Michael J Gruber
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=20100702010400.GA6058@burratino \
--to=jrnieder@gmail.com \
--cc=B.Steinbrink@gmx.de \
--cc=andrew@pimlott.net \
--cc=fbriere@fbriere.net \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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).