When I am working on assembling multiple commits at once, I make a large number of small commits with commit messages that indicate which commit they're going t

When I am working on assembling multiple commits at once, I make a large number of small commits with commit messages that indicate which commit they're going to end up in, and then do an interactive rebase at the end. The workflow looks something like: # At the point I realize I have two commits git add -p git commit -m 'first' git commit -am 'second' # Do some more editing git add -p; git commit -m 'debug' # commit the debug stuff so that I don't have to keep skipping it git add -p; git commit -m 'first' git add -p; git commit -m 'second' # After repeating the above a few times git rebase -i origin/master # Remove the debug commits, move the first/second/etc. commits together, squash the runs of first/second/etc. into one commit each, and then go back and write commit messages for each of them