Re: How to split a patch

From: Mike Hommey <mh@glandium.org>
Date: Jan 28, 2008, 10:49 UTC
Message-ID: <20080128104932.GA20586@glandium.org>
In-Reply-To: <7vr6g2teqh.fsf@gitster.siamese.dyndns.org>

On Mon, Jan 28, 2008 at 02:40:38AM -0800, Junio C Hamano <gitster@pobox.com> wrote:

Show 17 quoted lines

> Junio C Hamano <gitster@pobox.com> writes:
> 
> > Yes, and you can do the same with "git add -i".  These tools are
> > not quite nice, as they encourage a wrong workflow of committing
> > what you haven't had as a whole in the work tree.  By
> > definition, you are making untested commits between your base
> > commit (that presumably was tested well) and your final commit
> > (that would also be tested well).
> > ...
> > There is no such tool yet, though.
> > 
> > The splitting you can do with "rebase -i" instead walks
> > forwards.  That also lets you test before you make commits in
> > each step.
> 
> Having said all that, what I tend to do in practice is something
> like this:

(...)

I just git commit the hunks, then git stash the rest of the changes, and if I need some more changes to make the hunks only work, I commit --amend.

Once the commit is stable, I stash apply, resolving conflicts if any arose.

Mike