On Thu, Jun 26, 2025 at 8:03 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > Ayush Chandekar <ayu.chandekar@xxxxxxxxx> writes: > > > When core.commentChar is set to "auto", Git selects a comment character > > by scanning the commit message contents and avoiding any character > > already present in the message. > > > > If the message still contains old conflict comments (starting with a > > comment character), Git assumes that character is in use and chooses a > > different one. As a result, those existing comment lines are no longer > > recognized as comments and end up being included in the final commit > > message. > > > > To avoid this, skip scanning the trailing comment block when selecting > > the comment character. This allows Git to safely reuse the original > > character when appropriate, keeping the commit message clean and free of > > leftover conflict information. > > > > Background: > > > > The "auto" value for core.commentchar was introduced in the commit > > `84c9dc2` (commit: allow core.commentChar=auto for character auto > > selection) but did not exhibt this issue at that time. > > Use "git log -1 --format=reference", i.e. > > 84c9dc2c (commit: allow core.commentChar=auto for character auto > selection, 2014-05-17) > Got it, Thanks! I'll update it.
