git.ipfire.org Git - thirdparty/git.git/commit

]> git.ipfire.org Git - thirdparty/git.git/commit

projects / thirdparty / git.git / commit

author	Junio C Hamano <gitster@pobox.com>
	Mon, 2 Nov 2020 21:17:43 +0000 (13:17 -0800)
committer	Junio C Hamano <gitster@pobox.com>
	Mon, 2 Nov 2020 21:17:44 +0000 (13:17 -0800)
commit	1ae0949a036864de1f5caa7b375b875284d1c69e
tree	800b0226c23ed0596f38507d4d4ad8818307a94e	tree \| snapshot
parent	c23cd78e8127a2f80cc0357994209bc1bb81a4fe	commit \| diff
parent	296d4a94e7231a1d57356889f51bff57a1a3c5a1	commit \| diff

Merge branch 'mk/diff-ignore-regex'

"git diff" family of commands learned the "-I<regex>" option to
ignore hunks whose changed lines all match the given pattern.

* mk/diff-ignore-regex:
diff: add -I<regex> that ignores matching changes
merge-base, xdiff: zero out xpparam_t structures

Documentation/diff-options.txt	diff1 \|	diff2 \|	blob \| history
diff.c	diff1 \|	diff2 \|	blob \| history
diff.h	diff1 \|	diff2 \|	blob \| history
t/t4013-diff-various.sh	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

Documentation/diff-options.txt	diff1 \|	diff2 \|	blob \| history
diff.c	diff1 \|	diff2 \|	blob \| history
diff.h	diff1 \|	diff2 \|	blob \| history
t/t4013-diff-various.sh	diff1 \|	diff2 \|	blob \| history