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
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
-Tony
On Thu, Feb 09, 2006 at 03:49:16PM -0800, Luck, Tony wrote:
Looks very close to what I want.
quoted
git checkout topic
git format-patch --stdout origin > topic-diff
topic-diff contains each commit as a separate message
quoted
$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