From: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue, 05 Apr 2011 00:08:52 GMT
Subject: Re: How to split a big commit
Message-ID: <20110405000852.GA1704@elie>
In-Reply-To: <BANLkTikFXzut7fY5Tr0u-abu5Q0rMUOCmA@mail.gmail.com>

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.