tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2018-03-26	Remove contrib/examples/*	Ævar Arnfjörð Bjarmason	1	-620/+0
2017-08-23	treewide: correct several "up-to-date" to "up to date"	Martin Ågren	1	-2/+2
2015-12-27	contrib/examples/git-merge.sh: use the $( ... ) construct for command substit...	Elia Pinto	1	-2/+2
2014-06-09	contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>"	Elia Pinto	1	-2/+2
2014-04-17	git-merge.sh: use the $( ... ) construct for command substitution	Elia Pinto	1	-2/+2
2013-09-04	use 'commit-ish' instead of 'committish'	Richard Hansen	1	-1/+1
2010-08-18	merge script: learn --[no-]rerere-autoupdate	Jonathan Nieder	1	-2/+5
2010-08-18	merge script: notice @{-1} shorthand	Jonathan Nieder	1	-2/+4
2010-08-18	merge script: handle --no-ff --no-commit correctly	Jonathan Nieder	1	-2/+10
2010-08-18	merge script: --ff-only to disallow true merge	Jonathan Nieder	1	-2/+15
2010-08-18	merge script: handle many-way octopus	Jonathan Nieder	1	-3/+3
2010-08-18	merge script: handle -m --log correctly	Jonathan Nieder	1	-4/+10
2010-08-18	merge script: forbid merge -s index	Jonathan Nieder	1	-0/+5
2010-08-18	merge script: allow custom strategies	Jonathan Nieder	1	-2/+6
2010-08-18	merge script: merge -X<option>	Jonathan Nieder	1	-1/+7
2010-08-18	merge script: improve log message subject	Jonathan Nieder	1	-8/+19
2010-08-18	merge script: refuse to merge during merge	Jonathan Nieder	1	-0/+3
2010-08-18	merge script: tweak unmerged files message to match builtin	Jonathan Nieder	1	-1/+1
2010-08-18	merge script: --squash, --ff from unborn branch are errors	Jonathan Nieder	1	-0/+4
2010-01-17	git merge -X<option>	Avery Pennarun	1	-1/+2
2009-10-24	Use 'fast-forward' all over the place	Felipe Contreras	1	-4/+4
2008-07-16	Merge branch 'sb/dashless'	Junio C Hamano	1	-2/+2
2008-07-07	Build in merge	Miklos Vajna	1	-0/+554