What are you saying? That I can dodge bullets? - git add -e

New blag post, git add -e:

git add -e is like git add -p , except instead of adding things at the hunk level, you edit the entire patch at once. Or, in other words, whereas git add -p will show you each hunk for every file and ask what you want to do for each of them, git add -e will show you the entire patch and allow you to edit it at will. I used this trick to recently split apart one massive commit into 28 smaller, digestible ones. Say you've replaced a line containing "baz" with one containing "bar". When you git add -e , you'll be presented with a diff like so: foo - baz + bar From here you can decide, actually, you don't want to delete baz, you just want to add bar. And you want to add it above baz. From this spot you can just change the minus to a space, making that line context for the diff. Then you can move the line that adds bar above baz, with this result: foo + bar baz After saving and...

Full article: http://pivotallabs.com/users/khicks/blog/articles/2116-gi...