The main point is to make your commits small and incremental, with a single commit adding a single feature (or fixing a bug, etc). If you are reading the commit log, there shouldn't be any surprises as to what a particular commit actually changes when applied. If you have a lot of uncommitted changes, remember that you don't have to add them all at once -- use 'git add file1 file2' and make descriptive messages for each change. Also remember that you can 'rebase --interactive' to fix up your commits locally if you want (don't rebase shared/pushed history, though).
The main point is to make your commits small and incremental, with a single commit adding a single feature (or fixing a bug, etc). If you are reading the commit log, there shouldn't be any surprises as to what a particular commit actually changes when applied. If you have a lot of uncommitted changes, remember that you don't have to add them all at once -- use 'git add file1 file2' and make descriptive messages for each change. Also remember that you can 'rebase --interactive' to fix up your commits locally if you want (don't rebase shared/pushed history, though).