On Wed, 24 Jan 2018 08:57:10 -0800 Linus Torvalds <[email protected]> wrote:
> Maybe git should have used a different comment scheme, but I have to > admit that I think this is the first time I've heard of this issue > causing problems in practice. I'm sure it's triggered before, and > nobody has noticed (or I wasn't on the cc). It does happen a bit in practice. It's nailed me a few times. I just consider it as the way git works and didn't complain. > > So the '#' thing _normally_ works, but yes, it can cause issues. I just brought this up here: http://lkml.kernel.org/r/[email protected] And someone replied with a pointer to: https://github.com/git/git/blob/master/Documentation/RelNotes/2.0.0.txt suggesting git config commit.cleanup scissors Where git looks for: # ------------------------ >8 ------------------------ and does not delete comments before it. But this could play havoc when doing squash though. -- Steve
