From: Andrew Morton <akpm@osdl.org>
To: Dave Airlie <airlied@linux.ie>
Cc: linux-kernel@vger.kernel.org
Subject: Re: gcapatcch equivalent?
Date: Fri, 5 Aug 2005 15:10:17 -0700 [thread overview]
Message-ID: <20050805151017.745f4188.akpm@osdl.org> (raw)
In-Reply-To: <Pine.LNX.4.58.0508051157590.22353@skynet>
Dave Airlie <airlied@linux.ie> wrote:
>
>
> At KS I asked after a gcapatch command for git..
>
> I've got two trees drm-2.6 and linux-2.6, linux-2.6 is latest Linus, so of
> course a tree diff gives me all the new patches in linux-2.6 that aren't
> in drm-2.6 which isn't what I want.. I want gcapatch....
>
> I'm sure someone has one and I don't really want to care about git
> internals :-)
I do this, which mostly works:
MERGE_BASE=$(git-merge-base $(cat .git/refs/heads/origin ) \
$(cat .git/refs/heads/$patch_name))
cg-diff -r $MERGE_BASE:$(cat .git/refs/heads/$patch_name) >> \
$PULL/$patch_name.patch
(I'm supposed to be doing real git merges of 40 trees and let git do more
work for me. I'll do that when I'm feeling really, really trusting).
next prev parent reply other threads:[~2005-08-05 22:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-08-05 10:59 Dave Airlie
2005-08-05 22:10 ` Andrew Morton [this message]
2005-08-07 4:38 ` Ryan Anderson
2005-08-07 7:12 ` Jeff Garzik
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=20050805151017.745f4188.akpm@osdl.org \
--to=akpm@osdl.org \
--cc=airlied@linux.ie \
--cc=linux-kernel@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
all inboxes | Powered by JetHome®