tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
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
2010-01-17	rerere: honor conflict-marker-size attribute	Junio C Hamano	1	-0/+15
2010-01-16	conflict-marker-size: new attribute	Junio C Hamano	1	-25/+34
2010-01-16	xdl_merge(): introduce xmparam_t for merge specific parameters	Junio C Hamano	1	-3/+3
2010-01-16	git_attr(): fix function signature	Junio C Hamano	1	-1/+1
2010-01-05	run-command: convert simple callsites to use_shell	Jeff King	1	-3/+3
2009-08-10	Merge branch 'js/run-command-updates'	Junio C Hamano	1	-4/+0
2009-07-06	Merge branch 'tr/die_errno'	Junio C Hamano	1	-1/+1
2009-07-05	run_command: return exit code as positive value	Johannes Sixt	1	-4/+0
2009-07-01	Remove filename from conflict markers	Martin Renold	1	-4/+4
2009-06-27	Use die_errno() instead of die() when checking syscalls	Thomas Rast	1	-1/+1
2009-06-20	Merge branch 'sb/maint-1.6.0-add-config-fix'	Junio C Hamano	1	-4/+4
2009-06-14	use xstrdup, not strdup in ll-merge.c	Jim Meyering	1	-4/+4
2009-06-09	Simplify some instances of run_command() by using run_command_v_opt().	Johannes Sixt	1	-9/+2
2009-04-29	replace direct calls to unlink(2) with unlink_or_warn	Alex Riesen	1	-1/+1
2008-11-23	merge-recursive: use strbuf_expand() instead of interpolate()	René Scharfe	1	-12/+9
2008-08-30	git-merge-recursive: learn to honor merge.conflictstyle	Junio C Hamano	1	-5/+13
2008-05-14	Provide git_config with a callback-data parameter	Johannes Schindelin	1	-2/+2
2008-02-18	merge-recursive: split low-level merge functions out.	Junio C Hamano	1	-0/+379