tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2021-06-11	ll_union_merge(): rename path_unused parameter	Jeff King	1	-2/+2
2021-06-11	ll_union_merge(): pass name labels to ll_xdl_merge()	Jeff King	1	-1/+1
2021-06-11	ll_binary_merge(): handle XDL_MERGE_FAVOR_UNION	Jeff King	1	-1/+3
2021-03-13	use CALLOC_ARRAY	René Scharfe	1	-1/+1
2020-04-10	parse_config_key(): return subsection len as size_t	Jeff King	1	-1/+1
2019-09-03	am: reload .gitattributes after patching it	brian m. carlson	1	-4/+15
2019-01-04	Merge branch 'en/merge-path-collision'	Junio C Hamano	1	-1/+3
2018-11-08	merge-recursive: increase marker length with depth of recursion	Elijah Newren	1	-1/+3
2018-10-19	Merge branch 'nd/the-index'	Junio C Hamano	1	-8/+9
2018-09-21	ll-merge.c: remove implicit dependency on the_index	Nguyễn Thái Ngọc Duy	1	-8/+9
2018-09-12	Make git_check_attr() a void function	Torsten Bögershausen	1	-8/+8
2018-08-13	attr: remove an implicit dependency on the_index	Nguyễn Thái Ngọc Duy	1	-2/+2
2017-09-14	avoid "write_in_full(fd, buf, len) != len" pattern	Jeff King	1	-1/+1
2017-06-24	Merge branch 'ab/free-and-null'	Junio C Hamano	1	-2/+1
2017-06-24	Merge branch 'bw/config-h'	Junio C Hamano	1	-0/+1
2017-06-16	coccinelle: make use of the "expression" FREE_AND_NULL() rule	Ævar Arnfjörð Bjarmason	1	-2/+1
2017-06-15	config: don't include config.h by default	Brandon Williams	1	-0/+1
2017-06-13	convert: convert renormalize_buffer to take an index	Brandon Williams	1	-1/+1
2017-02-01	attr: convert git_check_attrs() callers to use the new API	Junio C Hamano	1	-19/+14
2017-02-01	attr: rename function and struct related to checking attributes	Junio C Hamano	1	-5/+5
2016-05-17	Merge branch 'jc/ll-merge-internal'	Junio C Hamano	1	-3/+9
2016-05-09	ll-merge: use a longer conflict marker for internal merge	Junio C Hamano	1	-2/+6
2016-04-14	ll-merge: fix typo in comment	Junio C Hamano	1	-1/+3
2016-02-22	use xmallocz to avoid size arithmetic	Jeff King	1	-1/+1
2015-10-20	Merge branch 'jk/war-on-sprintf'	Junio C Hamano	1	-6/+6
2015-09-28	Sync with 2.4.10	Junio C Hamano	1	-1/+4
2015-09-28	xdiff: reject files larger than ~1GB	Jeff King	1	-1/+4
2015-09-25	convert trivial sprintf / strcpy calls to xsnprintf	Jeff King	1	-6/+6
2015-06-04	ll-merge: pass the original path to external drivers	Junio C Hamano	1	-2/+8
2014-08-13	ll-merge.c: refactor `read_merge_config()` to use `git_config_string()`	Tanay Abhra	1	-17/+6
2013-01-23	convert some config callbacks to parse_config_key	Jeff King	1	-9/+5
2012-09-14	Merge branch 'jc/ll-merge-binary-ours'	Junio C Hamano	1	-8/+24
2012-09-12	ll-merge: warn about inability to merge binary files only when we can't	Junio C Hamano	1	-3/+4
2012-09-08	merge: teach -Xours/-Xtheirs to binary ll-merge driver	Junio C Hamano	1	-5/+20
2012-04-30	remove superfluous newlines in error messages	Pete Wyckoff	1	-1/+1
2011-08-04	Rename git_checkattr() to git_check_attr()	Michael Haggerty	1	-2/+2
2011-01-15	ll-merge: simplify opts == NULL case	Jonathan Nieder	1	-6/+3
2010-08-26	merge-recursive --patience	Justin Frankel	1	-0/+1
2010-08-26	ll-merge: replace flag argument with options struct	Jonathan Nieder	1	-17/+33
2010-08-06	ll-merge: let caller decide whether to renormalize	Jonathan Nieder	1	-3/+3
2010-08-06	ll-merge: make flag easier to populate	Jonathan Nieder	1	-4/+5
2010-07-02	Avoid conflicts when merging branches with mixed normalization	Eyvind Bernhardsen	1	-0/+15
2010-05-31	Rewrite dynamic structure initializations to runtime assignment	Gary V. Vaughan	1	-7/+7
2010-03-20	ll_merge(): add ancestor label parameter for diff3-style output	Jonathan Nieder	1	-9/+11
2010-03-20	xdl_merge(): move file1 and file2 labels to xmparam structure	Jonathan Nieder	1	-1/+3
2010-03-02	refactor merge flags into xmparam_t	Bert Wesarg	1	-8/+4
2010-03-02	make union merge an xdl merge favor	Bert Wesarg	1	-38/+5
2010-01-20	Merge branch 'jc/conflict-marker-size'	Junio C Hamano	1	-28/+53
2010-01-20	Merge branch 'ap/merge-backend-opts'	Junio C Hamano	1	-12/+13
2010-01-17	git merge -X<option>	Avery Pennarun	1	-12/+13