From: Ryan Anderson <ryan@michonline.com>
Date: Fri, 10 Feb 2006 00:40:40 GMT
Subject: Re: What's in git.git
Message-ID: <20060210004040.GB2866@mythryan2.michonline.com>
In-Reply-To: <B8E391BBE9FE384DAA4C5C003888BE6F05AA1FB3@scsmsx401.amr.corp.intel.com>

On Thu, Feb 09, 2006 at 03:49:16PM -0800, Luck, Tony wrote:
> Looks very close to what I want.
> 
> > git checkout topic
> > git format-patch --stdout origin > topic-diff
> 
>  topic-diff contains each commit as a separate message
> 
> > $VISUAL topic-diff
> > # Fix comments
> 
>  so this needs some skill & care to rearrange the pieces
>  and end up with legal input to git-am

Doh, right, I was thinking "git apply" actually.  (Apply the whole thing
as  single diff - the comments from each commit in the middle should get
ignored.)

Note that I don't believe there is any need to combine the hunks, just
stick them there in order and it *should* do the right thing.

> Perhaps I'd like to have:
> 
>  git diff SHA-where-I-branched..HEAD
> 
> but I don't see the way to compute the SHA-where-I-branched

git-merge-base topic master ?

-- 

Ryan Anderson
  sometimes Pug Majere