Merge branch 'jc/ignore-cr-at-eol'
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Nov 2017 02:06:31 +0000 (11:06 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Nov 2017 02:06:31 +0000 (11:06 +0900)
commit10f65c2...9a885336b745cc9d2e1654980ffef41e
treef10ffd0...4f85e27f3ff8b64e0d26e179df8bca77copy hash to clipboard (tree)
parent14c63a9...c093d6738454f6369a4f5663ca732cf7copy hash to clipboard (diff)
parente9282f0...b2f21118f3383608718e38efc3d967e1copy hash to clipboard (diff)
Documentation/diff-options.txt
Documentation/merge-strategies.txt
contrib/completion/git-completion.bash
diff.c
merge-recursive.c
t/t4015-diff-whitespace.sh
xdiff/xdiff.h
xdiff/xutils.c