]> git.ipfire.org Git - thirdparty/git.git/commit - Documentation/git-am.txt
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 53929db b9e55be)
Merge branch 'pb/ort-make-submodule-conflict-message-an-advice'
authorJunio C Hamano <gitster@pobox.com>
Tue, 5 Mar 2024 17:44:43 +0000 (09:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 5 Mar 2024 17:44:43 +0000 (09:44 -0800)
commit661f3797916d2bc3bd967a9dc9e6e464d5343758
tree508586b650ddbda72cfec2ad9432d0d0056296a7tree | snapshot
parent53929db7c4962c967ee56e586264c278b29c313ccommit | diff
parentb9e55be7401a5413722299279fc867eb931f4c3bcommit | diff
Merge branch 'pb/ort-make-submodule-conflict-message-an-advice'

When a merge conflicted at a submodule, merge-ort backend used to
unconditionally give a lengthy message to suggest how to resolve
it.  Now the message can be squelched as an advice message.

* pb/ort-make-submodule-conflict-message-an-advice:
  merge-ort: turn submodule conflict suggestions into an advice
Unnamed repository; edit this file 'description' to name the repository.