On 27/03/2019 22.20, Jacek Anaszewski wrote: > Thanks for the heads-up. I must admit I'm hitting into that for the > first time. After "git am" it was all OK, but it got screwed up after > "git rebase -i". And having "commit.cleanup = scissors" set globally all > the time is annoying if one extensively uses interactive rebase for > rewording commit messages. It entails the need for manual removal of > the whole stuff that appears then after actual commit message prepended > with "#" comment characters. Eh, no? At least, whenever I do commit or rebase -i, git automatically inserts a trailer starting with the magic scissor line # ------------------------ >8 ------------------------ # Do not modify or remove the line above. # Everything below it will be ignored. Maybe there's some other config option to get that, or it depends on git version. But I certainly don't do anything at all other than write or modify the commit message. Never had a problem myself since I set commit.cleanup = scissors, but I have had lots of my commit messages mangled, which is why I'm reacting. > This is probably the reason why people use often other characters > for command prompt (see the other fix for ledtrig-netdev). Command prompt char is not the only problem; C snippets with #include or other preprocessor directives also regularly gets mangled, as does shell snippets with a bit of commentary. Rasmus