I'm really late to this party but I want to stress a. Point that doesn't get mentioned often enough: Do not use "cp". Please. Copying changes to save them and

I'm really late to this party but I want to stress a. Point that doesn't get mentioned often enough: Do not use "cp". Please. Copying changes to save them and reapply later is nearly guaranteed to quietly lose changes, reintroduce removed code, or otherwise screw up your work. If you want to move changes stash them or commit them and then apply them elsewhere. Using cp throws out all of git's ability to help you do what you mean and not what you say. Also, the data corruption was caused by a bug, yes, but the cp based workflow being used will result in a nasty suprise sometime in the future.