diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-07-21 14:45:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-07-21 14:45:02 -0700 |
| commit | be3e6c348037e8179ccd2434eaa7a5af8273d1d3 (patch) | |
| tree | 29a35ca386ef27e110466a5137ab68bc4b5d4cba /commit.c | |
| parent | Merge branch 'rs/pop-recent-commit-with-prio-queue' into next (diff) | |
| parent | config: set comment_line_str to "#" when core.commentChar=auto (diff) | |
| download | git-be3e6c348037e8179ccd2434eaa7a5af8273d1d3.tar.gz git-be3e6c348037e8179ccd2434eaa7a5af8273d1d3.zip | |
Merge branch 'ac/auto-comment-char-fix' into next
"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"
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions