Re: how to combine 2 commits?

From: Imran M Yousuf <imyousuf@gmail.com>
Date: Jan 13, 2009, 05:32 UTC
Message-ID: <7bfdc29a0901122132l38837b37h188a8f5dd5ccbbd7@mail.gmail.com>
In-Reply-To: <200901122327.21102.bss@iguanasuicide.net>

On Tue, Jan 13, 2009 at 11:27 AM, Boyd Stephen Smith Jr. <bss@iguanasuicide.net> wrote:

Show 12 quoted lines

> 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.

Another way I can think of is - git format-patch + git apply, i.e. first generate 2 patches for the 2 commits and then apply them one on top of another.

Best regards,

Imran

Show 6 quoted lines

> --
> Boyd Stephen Smith Jr.                     ,= ,-_-. =.
> bss@iguanasuicide.net                     ((_/)o o(\_))
> ICQ: 514984 YM/AIM: DaTwinkDaddy           `-'(. .)`-'
> http://iguanasuicide.net/                      \_/
>

-- 
Imran M Yousuf
Entrepreneur & Software Engineer
Smart IT Engineering
Dhaka, Bangladesh
Email: imran@smartitengineering.com
Blog: http://imyousuf-tech.blogs.smartitengineering.com/
Mobile: +880-1711402557