summaryrefslogtreecommitdiff
path: root/Documentation/git-http-push.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-08-10 10:24:02 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-08-10 10:24:02 -0700
commit4339259d5fa45160fb75d17052038ba96fb3664a (patch)
tree909334fc232f06ddbfe126bbda5cf00f0e673dc3 /Documentation/git-http-push.txt
parentMerge branch 'jk/compiler-fixes-and-workarounds' (diff)
parentcheckout: support renormalization with checkout -m <paths> (diff)
downloadtgif-4339259d5fa45160fb75d17052038ba96fb3664a.tar.xz
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
Diffstat (limited to 'Documentation/git-http-push.txt')
0 files changed, 0 insertions, 0 deletions