]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitf084c50de6b584f3c2fd2af3550c53f4f238d19b
tree88a1f0aa9ea2922f42f249ae64e2c530aead39b1tree | snapshot
parent6a52f307af0e53aac2fcab8f995f69789472c334commit | diff
parent9c93ba4d0aee1bc8c663a13552afd2b2c22863a9commit | diff
Merge branch 'ad/merge-with-diff-algorithm'

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
Unnamed repository; edit this file 'description' to name the repository.