I use this workflow: 1. branch off master 2. work, commit, push, test (on CI server) 3. decide it's time to ship 4. rebase -i, push, test (again) 5.

I use this workflow: 1. branch off master 2. work, commit, push, test (on CI server) 3. decide it's time to ship 4. rebase -i, push, test (again) 5. git checkout master && git merge --no-ff feature_branch (make the merge commit message a summary of the feature) master ends up being a list of feature branch commits, bookended by the merge commit which introduced the feature. Getting the squash commit diff is as easy as 'git diff feature_branch_merge^..feature_branch_merge'.