]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1aa3dff 00906d6)
Merge branch 'en/eol-attrs-gotchas'
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Aug 2020 17:24:02 +0000 (10:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Aug 2020 17:24:02 +0000 (10:24 -0700)
All "mergy" operations that internally use the merge-recursive
machinery should honor the merge.renormalize configuration, but
many of them didn't.

* en/eol-attrs-gotchas:
  checkout: support renormalization with checkout -m <paths>
  merge: make merge.renormalize work for all uses of merge machinery
  t6038: remove problematic test
  t6038: make tests fail for the right reason

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

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