Comments on: Frequent code checkpointing with git http://phildawes.net/blog/2007/10/20/frequent-code-checkpointing-with-git/ Mostly programming with a few bits of other stuff Tue, 06 Jan 2009 19:55:52 +0000 http://wordpress.org/?v=2.1.1 By: bartman http://phildawes.net/blog/2007/10/20/frequent-code-checkpointing-with-git/#comment-49951 bartman Mon, 22 Oct 2007 13:18:54 +0000 http://phildawes.net/blog/2007/10/20/frequent-code-checkpointing-with-git/#comment-49951 Have you tried using git-rebase -i ? You need to give it the commit id of the last commit before your string of changes. You can then tell it to combine all your commits into one (or more). # *hack* git commit -a -m"one" # *hack* git commit -a -m"two" git rebase -i HEAD~2 # bring us an editor, select the "one" and "two" as squash, save, exit. git log An alternative workflow is to use git commit --amend. But this does not keep your micro history around. It just puts any recent changages into the last commit. # *hack* git commit -a -m"I am working on blah" # *hack* git commit --amend ... -Bart Have you tried using git-rebase -i ? You need to give it the commit id of the last commit before your string of changes. You can then tell it to combine all your commits into one (or more).

# *hack*
git commit -a -m”one”
# *hack*
git commit -a -m”two”
git rebase -i HEAD~2
# bring us an editor, select the “one” and “two” as squash, save, exit.
git log

An alternative workflow is to use git commit –amend. But this does not keep your micro history around. It just puts any recent changages into the last commit.

# *hack*
git commit -a -m”I am working on blah”
# *hack*
git commit –amend
…

-Bart

]]>