]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f62106d 624a935)
Merge branch 'en/merge-ort-align-verbosity-with-recursive'
authorJunio C Hamano <gitster@pobox.com>
Sun, 13 Mar 2022 22:56:17 +0000 (22:56 +0000)
committerJunio C Hamano <gitster@pobox.com>
Sun, 13 Mar 2022 22:56:17 +0000 (22:56 +0000)
commit8b44e05abf256c5c43116b983719cafca2934952
tree79d894b78d49a2d1be1123ad62b27d0720444f91tree | snapshot
parentf62106d750d6442ec2dda92908d4625c4ce90b99commit | diff
parent624a93507ed3af41506bb4878c43ed3d33be287ecommit | diff
Merge branch 'en/merge-ort-align-verbosity-with-recursive'

Align the level of verbose output from the ort backend during inner
merge to that of the recursive backend.

* en/merge-ort-align-verbosity-with-recursive:
  merge-ort: exclude messages from inner merges by default
merge-ort.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.