Git development
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Lionel Elie Mamane <lionel@mamane.lu>
Cc: git@vger.kernel.org
Subject: Re: Symmetric of rebase / more intelligent cherry-pick
Date: Tue, 11 Oct 2011 12:36:13 -0700	[thread overview]
Message-ID: <7v8vorfhhu.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20111011155444.GB14417@capsaicin.mamane.lu> (Lionel Elie Mamane's message of "Tue, 11 Oct 2011 17:54:44 +0200")

Lionel Elie Mamane <lionel@mamane.lu> writes:

> git cherry-pick ..UPSTREAM
> *nearly* does what I want, except that it lacks rebase's intelligence
> of skipping commits that do the same textual changes as a commit
> already in the current branch.

I think in the longer term "--ignore-if-in-upstream" that is known only to
format-patch, which is the true source the intelligence of rebase you
observed comes from, should be factored out into a helper function that
can be used to filter output from get_revision() in other commands, or
perhaps get_revision() itself might want to learn it.

I say "or perhaps might" above, because I do not think the general
revision traversal machinery used by the log family (which cherry-pick's
multi-pick option relies on) has enough information to decide what the
caller means by "upstream" at the point setup_revisions() is called.

  reply	other threads:[~2011-10-11 19:36 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-11 15:54 Symmetric of rebase / more intelligent cherry-pick Lionel Elie Mamane
2011-10-11 19:36 ` Junio C Hamano [this message]
2011-10-11 21:28   ` Junio C Hamano
2011-10-11 22:23     ` Jonathan Nieder

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=7v8vorfhhu.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=lionel@mamane.lu \
    /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