Git Protocol

It seems like there are conflicting views on how to write good history so le'ts follow our own guidelines and point out the cases where we have problems with history so we can maybe rediscuss this in the future.