projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit4339259d5fa45160fb75d17052038ba96fb3664a
tree909334fc232f06ddbfe126bbda5cf00f0e673dc3tree | snapshot
parent1aa3dff4ba492483a4cce0a3aa315cfc05b0bdd3commit | diff
parent00906d6f227b259ac7c8cebd07bbea0ba4792185commit | diff
Merge branch 'en/eol-attrs-gotchas'

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
merge-recursive.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.