With git 2.38.1 under Debian, when I use "git cherry-pick -x" on a commit such that the last line of the log message starts with "note:" (case insensitively), the blank line before the "cherry picked from commit" line is missing. For instance: New commit foo nOtE: (cherry picked from commit 3ba643e2eec4bdc1cd46b478ab36ee0707d241c2) and New commit Note: foo. (cherry picked from commit d0e85cdd32e30f78eeb968f275fc3a98899d791e) but the following ones are OK: New commit note: foo (cherry picked from commit a0ffae22fd3c94210170a3addcf802804f6ee5f7) ---- New commit A Note: (cherry picked from commit 0a89e0e7f8be3063803b0ad4381cd848ec52dd39) ---- New commit Note (cherry picked from commit f217bd5069c9d66a8ca54c869919ff484a18d20c) ---- I also had reported the bug in the Debian BTS: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1025155 -- Vincent Lefèvre <vincent@xxxxxxxxxx> - Web: <https://www.vinc17.net/> 100% accessible validated (X)HTML - Blog: <https://www.vinc17.net/blog/> Work: CR INRIA - computer arithmetic / AriC project (LIP, ENS-Lyon)