From: Lasse Makholm <lasse.makholm@gmail.com>
Date: Tue, 05 Apr 2011 02:31:54 GMT
Subject: Re: How to split a big commit
Message-ID: <BANLkTikZ_-OE1u_T+wGkYa3cSN0-KL-bGg@mail.gmail.com>
In-Reply-To: <20110405000852.GA1704@elie>

On 5 April 2011 02:08, Jonathan Nieder <jrnieder@gmail.com> wrote:
> Hi Duy,
>
> Nguyen Thai Ngoc Duy wrote:
>
>> After a lot of small commits and a few mixed up large commits, it was
>> too messy that I merged them all into one big commit then started
>> spliting it into smaller, reasonable patches. Just wonder if anybody
>> else faces the same thing and how they deal with it. I used "git reset
>> --soft <big commit>^" and "git add -N" because there were new files,
>> but it was clumsy.
>
> I tend to do "git reset HEAD^ -- ." and then "git add -N ." and
> "git add -p", for what it's worth.

In addition, after you've added some hunks, use git stash to stow away
all the other changes to test each new commit seperately.

/Lasse