Using the git index to fearlessly try out risky changes(osteele.com)
osteele.com
Using the git index to fearlessly try out risky changes
http://osteele.com/archives/2008/05/my-git-workflow
3 comments
Is this article useful for someone who doesn't know git? It would be helpful to have summaries/prerequisites as a first post... As is I can't bring myself to read it.
Not really. There are better git tutorials out there - http://osteele.com/del.icio.us/osteele/git (from the article).
Git allows you to choose which way you work more than (say) subversion. This article is an example of a slightly different way to work.
Git allows you to choose which way you work more than (say) subversion. This article is an example of a slightly different way to work.
why not just use a separate branch for doing those experimental changes ? it just seems too complicated.
My general philosophy right now is that I should only push one commit for each complete feature or bug fix, which wasn't really reasonable in old VCS systems. That lends itself to making micro-commits for almost anything and then using rebase -i to clean up the mess into a single commit. I've recently been experimenting with tagging the pre-rebase commit so that if I want to look at the development history I still can. I use git-stash if I'm in the middle of something and need to change branches for a few minutes, but aside from speed there's no reason it couldn't be a commit as well.