Update July 2012 (git 1.7.12+)
You now can rebase all commits up to root, and select the second commit Y to be squashed with the first X.
git rebase -i --root master
pick sha1 X
squash sha1 Y
pick sha1 Z
git rebase [-i] --root $tip
This command can now be used to rewrite all the history leading from “
$tip” down to the root commit.
See commit df5df20c1308f936ea542c86df1e9c6974168472 on GitHub from Chris Webb (arachsys).
As noted in the comments, a git push --force-with-lease (safer than --force, as Mikko Mantalainen remind us) would be needed after any rebase operation, if you need to publish that rework in a remote repository.
Original answer (February 2009)
I believe you will find different recipes for that in the SO question “How do I combine the first two commits of a git repository?“
Charles Bailey provided there the most detailed answer, reminding us that a commit is a full tree (not just diffs from a previous states).
And here the old commit (the “initial commit”) and the new commit (result of the squashing) will have no common ancestor.
That mean you can not “commit --amend” the initial commit into new one, and then rebase onto the new initial commit the history of the previous initial commit (lots of conflicts)
(That last sentence is no longer true with git rebase -i --root <aBranch>)
Rather (with A the original “initial commit”, and B a subsequent commit needed to be squashed into the initial one):
-
Go back to the last commit that we want to form the initial commit (detach HEAD):
git checkout <sha1_for_B> -
Reset the branch pointer to the initial commit, but leaving the index and working tree intact:
git reset --soft <sha1_for_A> -
Amend the initial tree using the tree from ‘B’:
git commit --amend -
Temporarily tag this new initial commit (or you could remember the new commit sha1 manually):
git tag tmp -
Go back to the original branch (assume master for this example):
git checkout master -
Replay all the commits after B onto the new initial commit:
git rebase --onto tmp <sha1_for_B> -
Remove the temporary tag:
git tag -d tmp
That way, the “rebase --onto” does not introduce conflicts during the merge, since it rebases history made after the last commit (B) to be squashed into the initial one (which was A) to tmp (representing the squashed new initial commit): trivial fast-forward merges only.
That works for “A-B“, but also “A-...-...-...-B” (any number of commits can be squashed into the initial one this way)