From: Alex Riesen <raa.lkml@gmail.com>
Date: Fri, 13 Jul 2007 04:54:47 GMT
Subject: Re: Lump commit HOWTO?
Message-ID: <20070713045447.GA2430@steel.home>
In-Reply-To: <625fc13d0707121821l70e2d6aaw555c79b5d700585f@mail.gmail.com>

Josh Boyer, Fri, Jul 13, 2007 03:21:17 +0200:
> Hi All,
> 
> I have a specific workflow in mind that I'm not entirely sure how to
> accomplish with git.  What I'd like to do is track a project in a
> local branch, and do commits of my own there as well.  Then when I'm
> ready to submit the work, I want to take all the incremental commits
> and lump them into a single new commit and push that out as a patch or
> into a branch for people to pull from.

See git merge --squash. It is exactly that.
Also git-rebase --interactive and git cherry-pick -n can help you to
get the same.