tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2008-08-27	Merge branch 'mv/merge-custom'	Junio C Hamano	1	-0/+4
2008-08-23	merge: fix numerus bugs around "trivial merge" area	Junio C Hamano	1	-0/+9
2008-08-20	"git-merge": allow fast-forwarding in a stat-dirty tree	Junio C Hamano	1	-0/+10
2008-07-29	Add a second testcase for handling invalid strategies in git-merge	Miklos Vajna	1	-0/+4
2008-07-20	builtin-merge.c: Fix option parsing	Michele Ballabio	1	-1/+1
2008-07-16	Merge branch 'sb/dashless'	Junio C Hamano	1	-1/+1
2008-07-16	Merge branch 'maint'	Junio C Hamano	1	-31/+7
2008-07-16	t7600-merge: Use test_expect_failure to test option parsing	Johannes Sixt	1	-30/+6
2008-07-14	reduce_heads(): protect from duplicate input	Junio C Hamano	1	-0/+22
2008-07-13	reduce_heads(): thinkofix	Sverre Hvammen Johansen	1	-0/+11
2008-07-13	t/: Use "test_must_fail git" instead of "! git"	Stephan Beyer	1	-1/+1
2008-07-10	Teach merge.log to "git-merge" again	Junio C Hamano	1	-0/+7
2008-04-12	merge, pull: add '--(no-)log' command line option	SZEDER Gábor	1	-1/+15
2008-04-12	merge, pull: introduce '--(no-)stat' option	SZEDER Gábor	1	-4/+19
2008-03-13	add test_cmp function for test scripts	Jeff King	1	-1/+1
2008-03-13	remove use of "tail -n 1" and "tail -1"	Jeff King	1	-1/+1
2008-03-13	grep portability fix: don't use "-e" or "-q"	Jeff King	1	-2/+2
2008-03-03	git-merge.sh: better handling of combined --squash,--no-ff,--no-commit options	Gerrit Pape	1	-0/+6
2008-01-05	t/t7600: avoid GNUism in grep	Junio C Hamano	1	-2/+2
2007-09-23	git-merge: add --ff and --no-ff options	Lars Hjemli	1	-0/+20
2007-09-23	git-merge: add support for --commit and --no-squash	Lars Hjemli	1	-0/+22
2007-09-23	git-merge: add support for branch.<name>.mergeoptions	Lars Hjemli	1	-0/+54
2007-09-23	Add test-script for git-merge porcelain	Lars Hjemli	1	-0/+344