From: Alex Riesen <raa.lkml@gmail.com>
To: Avery Pennarun <apenwarr@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: git rebase to move a batch of patches onto the current branch
Date: Thu, 24 Jul 2008 22:30:49 +0200 [thread overview]
Message-ID: <20080724203049.GC3760@blimp.local> (raw)
In-Reply-To: <32541b130807241316x4f85bcdfw12857be575fb3289@mail.gmail.com>
Avery Pennarun, Thu, Jul 24, 2008 22:16:06 +0200:
> On 7/24/08, Alex Riesen <raa.lkml@gmail.com> wrote:
> > gcp3 ()
> > {
> > git format-patch -k --stdout --full-index "$@" | git am -k -3 --binary
> > }
>
> But that'll give up when there are conflicts, right? git-rebase lets
> me fix them in a nice way.
>
No, it same as in rebase. You'll fix them and do "git am --resolved".
See manpage of git am.
next prev parent reply other threads:[~2008-07-24 20:32 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-24 19:57 git rebase to move a batch of patches onto the current branch Avery Pennarun
2008-07-24 20:13 ` Alex Riesen
2008-07-24 20:16 ` Avery Pennarun
2008-07-24 20:30 ` Alex Riesen [this message]
2008-07-24 20:42 ` Avery Pennarun
2008-07-25 19:16 ` Daniel Barkalow
2008-07-25 19:25 ` Stephan Beyer
2008-07-25 20:00 ` Alex Riesen
2008-07-25 20:31 ` Björn Steinbrink
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=20080724203049.GC3760@blimp.local \
--to=raa.lkml@gmail.com \
--cc=apenwarr@gmail.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.