tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2010-09-03	setup_unpack_trees_porcelain: take the whole options struct as parameter	Matthieu Moy	1	-1/+1
2010-09-03	Move set_porcelain_error_msgs to unpack-trees.c and rename it	Matthieu Moy	1	-1/+1
2010-08-26	merge-recursive: expose merge options for builtin merge	Jonathan Nieder	1	-18/+2
2010-08-21	Merge branch 'gb/split-cmdline-errmsg'	Junio C Hamano	1	-1/+2
2010-08-18	merge: do not mistake (ancestor of) tag for branch	Jonathan Nieder	1	-1/+1
2010-08-15	merge: let custom strategies intervene in trivial merges	Jonathan Nieder	1	-0/+1
2010-08-11	unpack_trees: group error messages by type	Matthieu Moy	1	-0/+1
2010-08-11	merge-recursive: porcelain messages for checkout	Diane Gasselin	1	-1/+1
2010-08-11	Turn unpack_trees_options.msgs into an array + enum	Matthieu Moy	1	-1/+1
2010-08-11	split_cmdline: Allow caller to access error string	Greg Brockman	1	-1/+2
2010-08-06	merge-recursive --renormalize	Jonathan Nieder	1	-5/+14
2010-07-02	Avoid conflicts when merging branches with mixed normalization	Eyvind Bernhardsen	1	-0/+3
2010-06-18	Merge branch 'tc/merge-m-log'	Junio C Hamano	1	-8/+12
2010-05-10	merge: --log appends shortlog to message if specified	Tay Ray Chuan	1	-7/+11
2010-05-10	merge: rename variable	Tay Ray Chuan	1	-3/+3
2010-05-10	merge: update comment	Tay Ray Chuan	1	-1/+1
2010-05-08	Merge branch 'cc/revert-strategy'	Junio C Hamano	1	-36/+45
2010-04-01	merge: make function try_merge_command non static	Christian Couder	1	-2/+2
2010-04-01	merge: refactor code that calls "git merge-STRATEGY"	Christian Couder	1	-36/+45
2010-03-28	Merge branch 'cc/cherry-pick-ff'	Junio C Hamano	1	-1/+1
2010-02-22	Move 'builtin-*' into a 'builtin/' subdirectory	Linus Torvalds	1	-0/+1292