]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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

1  2 
merge-ort.c patch | diff1 | diff2 | blob | history

diff --cc merge-ort.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.