On Mon, Jan 28, 2008 at 02:40:38AM -0800, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Junio C Hamano <gitster@xxxxxxxxx> 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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
