| commit | d345ceda32412d8575234ad8b959d9f598b00a6e | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 28 Jul 2025 19:02:34 +0000 (28 12:02 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 28 Jul 2025 19:02:34 +0000 (28 12:02 -0700) | ||
| tree | 3fab6580d77ba77fd75de4d360d36d2db06be60d | treesnapshot (tar.gz zip) |
| parent | 0f6e5037d40db4768e8b61aea22c68c9711ce544 | commitdiff |
| parent | 92b7c7c9f5fde4972a653ddb90eca52c592de07e | commitdiff |
Merge branch 'ac/auto-comment-char-fix'
"git commit" that concludes a conflicted merge failed to notice and remove
existing comment added automatically (like "# Conflicts:") when the
core.commentstring is set to 'auto'.
* ac/auto-comment-char-fix:
config: set comment_line_str to "#" when core.commentChar=auto
commit: avoid scanning trailing comments when 'core.commentChar' is "auto"
"git commit" that concludes a conflicted merge failed to notice and remove
existing comment added automatically (like "# Conflicts:") when the
core.commentstring is set to 'auto'.
* ac/auto-comment-char-fix:
config: set comment_line_str to "#" when core.commentChar=auto
commit: avoid scanning trailing comments when 'core.commentChar' is "auto"
| config.c | diff1 | diff2 | blobhistory |