]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0f6e503 92b7c7c)
Merge branch 'ac/auto-comment-char-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 28 Jul 2025 19:02:34 +0000 (12:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Jul 2025 19:02:34 +0000 (12:02 -0700)
commitd345ceda32412d8575234ad8b959d9f598b00a6e
tree3fab6580d77ba77fd75de4d360d36d2db06be60dtree
parent0f6e5037d40db4768e8b61aea22c68c9711ce544commit | diff
parent92b7c7c9f5fde4972a653ddb90eca52c592de07ecommit | diff
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"
config.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.