git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andrew Pimlott <andrew@pimlott.net>
To: "Björn Steinbrink" <b.steinbrink@gmx.de>
Cc: git <git@vger.kernel.org>
Subject: Re: git cherry not marking commits with equivalent upstream
Date: Thu, 01 Jul 2010 14:17:01 -0700	[thread overview]
Message-ID: <1278017685-sup-6132@pimlott.net> (raw)
In-Reply-To: <20100701204151.GA6354@atjola.homenet>

Excerpts from Björn Steinbrink's message of Thu Jul 01 13:41:51 -0700 2010:
> pull = fetch + merge, so your history in "b" looks like this:
> 
>   2 (origin/master)
>  / \
> 1   M (master)
>  \ /
>   3
> 
> So "2" is common to both branches and thus ignored by cherry.

Ok, it's unintuitive to me that 2 is not considered part of the upstream
branch just because I've merged it into mine, but that explains it.
Thanks!

However, I want to merge commits from upstream regularly and still
figure out what unmerged commits I have.  So how can I make this use
case work?  It sounds like I want to make git-cherry check against
everything upstream since the fork point, not just what I haven't
merged.  Would this be hard?

Andrew

  reply	other threads:[~2010-07-01 21:24 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 [this message]
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
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=1278017685-sup-6132@pimlott.net \
    --to=andrew@pimlott.net \
    --cc=b.steinbrink@gmx.de \
    --cc=git@vger.kernel.org \
    /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).