git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Geoffrey Irving <irving@naml.us>
To: git@vger.kernel.org
Cc: Dylan Simon <dylan@dylex.net>
Subject: one half of a rebase
Date: Fri, 11 Sep 2009 13:25:59 -0400	[thread overview]
Message-ID: <7f9d599f0909111025q42e3cdc6vba602b84c1d81215@mail.gmail.com> (raw)

If I'm on branch topic and do "git rebase master", git performs two operations:

1. Rewind the current head to master.
2. For each commit in topic that isn't in master, cherry pick it onto
the current head.

I would like to be able to do (2) as a separate operation.  For
example, if I start out on branch master and want to get all of
topic's commits on top of the current head, I currently do

    git checkout topic
    git rebase master
    git branch -d master
    git branch -m master

If I could do (2) as a separate operation, it would look something like

    git cherry-pick-all topic

which is simpler and faster since it avoids switching files back and
forth (master to topic and back).  Is there a robust way to achieve
the cherry-pick-all semantics with current commands?  If not, how
difficult would it be to partition rebase accordingly?

Thanks,
Geoffrey

             reply	other threads:[~2009-09-11 17:26 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-09-11 17:25 Geoffrey Irving [this message]
2009-09-11 18:39 ` one half of a rebase Matthieu Moy
2009-09-11 21:10 ` Alex Riesen
2009-09-12  2:23   ` Geoffrey Irving
2009-09-12 14:38     ` Paolo Bonzini

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=7f9d599f0909111025q42e3cdc6vba602b84c1d81215@mail.gmail.com \
    --to=irving@naml.us \
    --cc=dylan@dylex.net \
    --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).