git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Brandon Casey <casey@nrlssc.navy.mil>
To: git@vger.kernel.org
Subject: cherry-pick --since ?
Date: Fri, 20 Apr 2007 11:20:32 -0500 (CDT)	[thread overview]
Message-ID: <Pine.LNX.4.64.0704201100050.4667@torch.nrlssc.navy.mil> (raw)



Is there functionality to allow something akin to
a
    git cherry-pick --since <commit>

or maybe syntax similar to git cherry where the upstream, head,
and limit can be specified. Or the .. syntax would work.


Here's my use case:

Two branches, 'A' and 'B'.
'A' is the master branch.
'B' was forked some time ago and is in bug fix only mode.
Much of 'A' and 'B' are still the same, but there have been
   some intrusive changes made to 'A' that should not go into 'B'.
   This is also why I can't just pull from 'B'. rebase may work,
   but then of course all of the commit id's change.

When changes are made in 'B' I currently cherry-pick each commit
into 'A' (where possible). This can be tedious when there are many
commits. I can use git cherry to show me which commits should be
cherry-picked, it would be nice if I could cherry-pick a range of
commits.

I am not subscribed to the list so please cc me. I hope this is ok,
if not let me know and I will subscribe. I am only a casual read of
the list.

-brandon

             reply	other threads:[~2007-04-20 16:20 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-04-20 16:20 Brandon Casey [this message]
2007-04-20 18:55 ` cherry-pick --since ? Alex Riesen
2007-04-22 12:06   ` David Kågedal
2007-04-20 23:05 ` Junio C Hamano
2007-04-23 17:52   ` Brandon Casey
2007-04-23 19:32     ` Junio C Hamano
2007-04-23 23:18       ` Brandon Casey
2009-07-16  8:11 ` Git range merge (cherry-pick a range) bshOriginal
2009-07-16 11:36   ` Michael J Gruber
     [not found]     ` <6efe9a9b0907160516o75641919wd1eecf5229aea895@mail.gmail.com>
2009-07-16 12:44       ` Michael J Gruber
2009-07-16 16:27   ` Daniel Barkalow
2009-07-17  8:41   ` bshOriginal

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.0704201100050.4667@torch.nrlssc.navy.mil \
    --to=casey@nrlssc.navy.mil \
    --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).