From: Boyd Stephen Smith Jr. <bss@iguanasuicide.net>
Date: Tue, 13 Jan 2009 05:27:16 GMT
Subject: Re: how to combine 2 commits?
Message-ID: <200901122327.21102.bss@iguanasuicide.net>
In-Reply-To: <20090113045422.GA6940@b2j>

On Monday 12 January 2009, bill lam <cbill.lam@gmail.com> wrote about 'how 
to combine 2 commits?':
>How to combine these 2 commits so that the changes of linefeed cancel
>out each other and the history only shows the intended changes of the
>few scripts.

Two ways I can think of:
git rebase --interactive (read "git help rebase" first)
git merge --squash (read "git help merge" first)

The rebase is probably semantically closer to how you are thinking about 
things right now.
-- 
Boyd Stephen Smith Jr.                     ,= ,-_-. =. 
bss@iguanasuicide.net                     ((_/)o o(\_))
ICQ: 514984 YM/AIM: DaTwinkDaddy           `-'(. .)`-' 
http://iguanasuicide.net/                      \_/