git.git - The core git plumbing

Age	Commit message (Expand)	Author	Files	Lines
2023-10-09	diff-merges: introduce '--dd' option	Sergey Organov	1	-0/+3
2023-02-23	object.h: stop depending on cache.h; make cache.h depend on object.h	Elijah Newren	1	-0/+1
2023-02-23	treewide: ensure one of the appropriate headers is sourced first	Elijah Newren	1	-0/+1
2022-09-16	diff-merges: cleanup set_diff_merges()	Sergey Organov	1	-11/+19
2022-09-16	diff-merges: cleanup func_by_opt()	Sergey Organov	1	-5/+5
2022-02-25	Merge branch 'ja/i18n-common-messages'	Junio C Hamano	1	-1/+1
2022-02-04	i18n: factorize "invalid value" messages	Jean-Noël Avila	1	-1/+1
2022-02-02	diff-merges: avoid history simplifications when diffing merges	Elijah Newren	1	-0/+2
2022-02-02	show, log: provide a --remerge-diff capability	Elijah Newren	1	-0/+12
2021-09-07	diff-index: restore -c/--cc options handling	Sergey Organov	1	-10/+4
2021-08-09	Revert 'diff-merges: let "-m" imply "-p"'	Jonathan Nieder	1	-1/+0
2021-05-21	diff-merges: let "-m" imply "-p"	Sergey Organov	1	-0/+1
2021-05-21	diff-merges: rename "combined_imply_patch" to "merges_imply_patch"	Sergey Organov	1	-5/+5
2021-05-21	diff-merges: move specific diff-index "-m" handling to diff-index	Sergey Organov	1	-12/+13
2021-04-16	diff-merges: introduce log.diffMerges config variable	Sergey Organov	1	-0/+11
2021-04-16	diff-merges: adapt -m to enable default diff format	Sergey Organov	1	-4/+4
2021-04-16	diff-merges: refactor set_diff_merges()	Sergey Organov	1	-15/+21
2021-04-16	diff-merges: introduce --diff-merges=on	Sergey Organov	1	-0/+7
2020-12-21	diff-merges: add '--diff-merges=1' as synonym for 'first-parent'	Sergey Organov	1	-1/+1
2020-12-21	diff-merges: add old mnemonic counterparts to --diff-merges	Sergey Organov	1	-3/+3
2020-12-21	diff-merges: let new options enable diff without -p	Sergey Organov	1	-5/+12
2020-12-21	diff-merges: do not imply -p for new options	Sergey Organov	1	-8/+12
2020-12-21	diff-merges: implement new values for --diff-merges	Sergey Organov	1	-3/+16
2020-12-21	diff-merges: make -m/-c/--cc explicitly mutually exclusive	Sergey Organov	1	-0/+3
2020-12-21	diff-merges: refactor opt settings into separate functions	Sergey Organov	1	-22/+41
2020-12-21	diff-merges: get rid of now empty diff_merges_init_revs()	Sergey Organov	1	-4/+0
2020-12-21	diff-merges: split 'ignore_merges' field	Sergey Organov	1	-18/+13
2020-12-21	diff-merges: fix -m to properly override -c/--cc	Sergey Organov	1	-0/+1
2020-12-21	diff-merges: revise revs->diff flag handling	Sergey Organov	1	-3/+1
2020-12-21	diff-merges: handle imply -p on -c/--cc logic for log.c	Sergey Organov	1	-0/+5
2020-12-21	diff-merges: introduce revs->first_parent_merges flag	Sergey Organov	1	-0/+2
2020-12-21	diff-merges: new function diff_merges_set_dense_combined_if_unset()	Sergey Organov	1	-2/+14
2020-12-21	diff-merges: new function diff_merges_suppress()	Sergey Organov	1	-2/+15
2020-12-21	diff-merges: re-arrange functions to match the order they are called in	Sergey Organov	1	-10/+14
2020-12-21	diff-merges: rename diff_merges_default_to_enable() to match semantics	Sergey Organov	1	-1/+1
2020-12-21	diff-merges: move checks for first_parent_only out of the module	Sergey Organov	1	-6/+4
2020-12-21	diff-merges: rename all functions to have common prefix	Sergey Organov	1	-5/+5
2020-12-21	revision: move diff merges functions to its own diff-merges.c	Sergey Organov	1	-0/+76