git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alex Riesen <raa.lkml@gmail.com>
To: Jozef Babjak <jozef.babjak@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Picking up multiple cherries at one go.
Date: Wed, 24 Mar 2010 10:21:29 +0100	[thread overview]
Message-ID: <81b0412b1003240221o53196568r9c8f2e0b7a2f1fd7@mail.gmail.com> (raw)
In-Reply-To: <ffef8f9a1003240147o777d058jfacd79aa86908925@mail.gmail.com>

On Wed, Mar 24, 2010 at 09:47, Jozef Babjak <jozef.babjak@gmail.com> wrote:
> However, last days I needed to split a long multi-purpose branch into
> several topic branches. The branch was created as a result of 'general
> cleanup and refactoring', but at the end of day I realized that some
> well-defined parts can be identified there and so I wanted to extract
> them to dedicated branches. Thus, cherry-pick and rebase were my
> friend for couple of days. Everything goes well, but there was a
> repetitive task - cherry picking multiple commits. Sometimes the
> process failed, because cherry picking led to conflicts. ...

Try git rebase -i (interactive) next time. It does not exactly what your
script does, but ... You may like it.

> To simplify this task, I wrote the shell script attached at the end of this
> email.The script named git_cherries.sh reads commit IDs from stdin and
> cherry-picks those commits to current branch. Everything is done on an
> auxilliary branch, ...

You can commit without a branch (called "detached HEAD").
Try "git checkout HEAD^0", for example.
No need to invent new branch names (and risk collisions).

  reply	other threads:[~2010-03-24  9:21 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-24  8:47 Picking up multiple cherries at one go Jozef Babjak
2010-03-24  9:21 ` Alex Riesen [this message]
     [not found]   ` <ffef8f9a1003240236x34be6051ja8d013453d88d3a1@mail.gmail.com>
2010-03-24 11:52     ` Alex Riesen

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=81b0412b1003240221o53196568r9c8f2e0b7a2f1fd7@mail.gmail.com \
    --to=raa.lkml@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=jozef.babjak@gmail.com \
    /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).