tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2017-03-21	prefix_filename: return newly allocated string	Jeff King	1	-3/+11
2017-03-21	prefix_filename: drop length parameter	Jeff King	1	-6/+2
2016-05-09	builtin/merge-file.c: use error_errno()	Nguyễn Thái Ngọc Duy	1	-5/+5
2015-10-30	Merge branch 'jk/merge-file-exit-code'	Junio C Hamano	1	-0/+3
2015-10-29	merge-file: clamp exit code to maximum 127	Jeff King	1	-0/+3
2015-09-28	Sync with 2.3.10	Junio C Hamano	1	-1/+2
2015-09-28	merge-file: enforce MAX_XDIFF_SIZE on incoming files	Jeff King	1	-1/+2
2015-02-22	Merge branch 'ab/merge-file-prefix'	Junio C Hamano	1	-1/+2
2015-02-11	merge-file: correctly open files when in a subdir	Aleksander Boruch-Gruszecki	1	-1/+2
2015-01-14	standardize usage info string format	Alex Henrie	1	-2/+2
2013-08-05	Replace deprecated OPT_BOOLEAN by OPT_BOOL	Stefan Beller	1	-1/+1
2012-08-20	i18n: merge-file: mark parseopt strings for translation	Nguyễn Thái Ngọc Duy	1	-10/+10
2012-04-30	remove superfluous newlines in error messages	Pete Wyckoff	1	-2/+2
2010-11-24	Merge branch 'rs/opt-help-text'	Junio C Hamano	1	-1/+1
2010-11-15	Describe various forms of "be quiet" using OPT__QUIET	Jonathan Nieder	1	-1/+1
2010-11-15	add description parameter to OPT__QUIET	René Scharfe	1	-1/+1
2010-10-18	merge-file: correctly find files when called in subdir	Thomas Rast	1	-1/+6
2010-08-15	merge-file: run setup_git_directory_gently() sooner	Nguyễn Thái Ngọc Duy	1	-3/+1
2010-06-13	Merge branch 'rs/diff-no-minimal'	Junio C Hamano	1	-1/+1
2010-03-20	merge-file --diff3: add a label for ancestor	Jonathan Nieder	1	-0/+1
2010-03-20	xdl_merge(): move file1 and file2 labels to xmparam structure	Jonathan Nieder	1	-2/+3
2010-03-20	Merge branch 'bw/union-merge-refactor'	Junio C Hamano	1	-9/+14
2010-02-22	Move 'builtin-*' into a 'builtin/' subdirectory	Linus Torvalds	1	-0/+96