On Monday 09 February 2009 15:59:40 Brent Goodrick wrote:
> To explain what I mean: Yesterday, I had this configuration on my
> bg/no-progress branch:
>
> A---B---C---D (bg/no-progress)
> /
> ----1-----2----3----4 (master)
>
> B C and D commits are noisy,
> fix-the-white-space-and-conform-to-coding-guidelines type commits. I
> want to collapse A through D into one commit called E on that branch
> so that I can run git format-patch -M on the result and provide a nice
> patch email. I would end up with:
>
> E (bg/no-progress)
> /
> ----1-----2----3----4 (master)
Here's my way to do that:
git rebase -i $(git merge-base master bg/noprogress) bg/no-progress
# Editor opens
# Change "pick" -> "squash" for commits B, C, and D.
# rebase runs
# Maybe resolve conflicts
If you are willing to have:
E (bg/no-progress)
/
--1--2--3--4 (master)
at the end, it's a little bit simpler:
git rebase -i master bg/no-progress
# All the rest the same.
--
Boyd Stephen Smith Jr. ,= ,-_-. =.
bss@xxxxxxxxxxxxxxxxx ((_/)o o(\_))
ICQ: 514984 YM/AIM: DaTwinkDaddy `-'(. .)`-'
http://iguanasuicide.net/ \_/
Attachment:
signature.asc
Description: This is a digitally signed message part.
