Re: git rebase --interactive squash/squish/fold/rollup

From: Minty <mintywalker@gmail.com>
Date: Jun 17, 2009, 13:45 UTC
Message-ID: <e1868cfe0906170645h2629e6f5v6dfe10d0cb909f77@mail.gmail.com>
In-Reply-To: <43d8ce650906170555m644564b3v3722168f7217c326@mail.gmail.com>

On Wed, Jun 17, 2009 at 1:55 PM, John Tapsell <johnflux@gmail.com> wrote:

Show 5 quoted lines

>
> > branch, hack, commit.
> > hack, commit, hack, commit
>
> What if you used  commit --append  instead?

That appears to be a switch I don't have, nor is documented

http://www.kernel.org/pub/software/scm/git/docs/git-commit.html

Did you perhaps mean --amend?  Or have I missed something?

--amend is not really a solution for me - it is perhaps a quirk of my working pattern, but I typically (on the branch) commit tiny tiny bits of a (possibly incomplete) feature, then want to merge them back into a single "feature commit" to merge with trunk. It's a case of building up a feature commit one step at a time.

Perhaps I'm not normal or going about it wrong, in that I'm happy to commit (on a branch) an incomplete bit of code ... pop off to do something else, come back, hack a little more ... go off, come back ... eventually ending up with a bunch of commits I want to merge down into a smaller set of (combined) commits which to then merge with master/trunk.

fwiw, I didn't set out with this pattern in mind, it's rather one I have noticed myself being in frequently. It seems quite natural to me, except for this repeated squashing mini commits down. I'm not squashing ALL commits down into one single commit. Rather many commits down into a few commits, which then get merged with master/trunk.