]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6a52f30 9c93ba4)
Merge branch 'ad/merge-with-diff-algorithm'
authorJunio C Hamano <gitster@pobox.com>
Wed, 31 Jul 2024 20:34:16 +0000 (13:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 31 Jul 2024 20:34:16 +0000 (13:34 -0700)
Many Porcelain commands that internally use the merge machinery
were taught to consistently honor the diff.algorithm configuration.

* ad/merge-with-diff-algorithm:
  merge-recursive: honor diff.algorithm


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.