summaryrefslogtreecommitdiff
path: root/Documentation/git-config.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-11-27 11:06:31 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-11-27 11:06:31 +0900
commit10f65c239a885336b745cc9d2e1654980ffef41e (patch)
treef10ffd064f85e27f3ff8b64e0d26e179df8bca77 /Documentation/git-config.txt
parentSync with maint (diff)
parentdiff: --ignore-cr-at-eol (diff)
downloadtgif-10f65c239a885336b745cc9d2e1654980ffef41e.tar.xz
Merge branch 'jc/ignore-cr-at-eol'
The "diff" family of commands learned to ignore differences in carriage return at the end of line. * jc/ignore-cr-at-eol: diff: --ignore-cr-at-eol xdiff: reassign xpparm_t.flags bits
Diffstat (limited to 'Documentation/git-config.txt')
0 files changed, 0 insertions, 0 deletions