git.99rst.org Git - git.git/commit

author	Junio C Hamano <redacted>
	Mon, 27 Nov 2017 02:06:31 +0000 (11:06 +0900)
committer	Junio C Hamano <redacted>
	Mon, 27 Nov 2017 02:06:31 +0000 (11:06 +0900)
commit	10f65c239a885336b745cc9d2e1654980ffef41e
tree	f10ffd064f85e27f3ff8b64e0d26e179df8bca77	tree \| snapshot
parent	14c63a9dc093d6738454f6369a4f5663ca732cf7	commit \| diff
parent	e9282f02b2f21118f3383608718e38efc3d967e1	commit \| diff

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

Documentation/diff-options.txt	diff1 \|	diff2 \|	blob \| history
Documentation/merge-strategies.txt	diff1 \|	diff2 \|	blob \| history
contrib/completion/git-completion.bash	diff1 \|	diff2 \|	blob \| history
diff.c	diff1 \|	diff2 \|	blob \| history
merge-recursive.c	diff1 \|	diff2 \|	blob \| history
t/t4015-diff-whitespace.sh	diff1 \|	diff2 \|	blob \| history
xdiff/xdiff.h	diff1 \|	diff2 \|	blob \| history
xdiff/xutils.c	diff1 \|	diff2 \|	blob \| history

RSS Atom

git clone https://git.99rst.org/PROJECT

Documentation/diff-options.txt	diff1 \|	diff2 \|	blob \| history
Documentation/merge-strategies.txt	diff1 \|	diff2 \|	blob \| history
contrib/completion/git-completion.bash	diff1 \|	diff2 \|	blob \| history
diff.c	diff1 \|	diff2 \|	blob \| history
merge-recursive.c	diff1 \|	diff2 \|	blob \| history
t/t4015-diff-whitespace.sh	diff1 \|	diff2 \|	blob \| history
xdiff/xdiff.h	diff1 \|	diff2 \|	blob \| history
xdiff/xutils.c	diff1 \|	diff2 \|	blob \| history