tgif.git - Terin's Improved Git Fork

Age	Commit message (Collapse)	Author	Files	Lines
2007-01-09	-u is now default for 'git-applymbox'	Junio C Hamano	1	-7/+7
	It has '-n' to disable it just in case, but do not even bother documenting it. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-20	Brief documentation for the mysterious git-am script	Petr Baudis	1	-1/+1
	The git-am script is nowhere called and nowhere (including itself) explained, and the name isn't helpful either. For those like me who will wonder what is it about, add some documentation stub for it to the documentation. I probably got something wrong and I don't feel like investigating all the options - this is just kind of "emergency" docs. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-06	Fall back to three-way merge when applying a patch.	Junio C Hamano	1	-1/+9
	After git-apply fails, attempt to find a base tree that the patch cleanly applies to, and do a three-way merge using that base tree into the current index, if .dotest/.3way file exists. This flag can be controlled by giving -m flag to git-applymbox command. When the fall-back merge fails, the working tree can be resolved the same way as you would normally hand resolve a conflicting merge. When making commit, use .dotest/final-commit as the log message template. Or you could just choose to 'git-checkout-index -f -a' to revert the failed merge. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-05	Some typos and light editing of various manpages	Christian Meder	1	-1/+1
	Typos, light editing and clarifications. Signed-off-by: Christian Meder <chris@absolutegiganten.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-20	[PATCH] Documentation: Update all files to use the new gitlink: macro	Sergey Vlasov	1	-2/+2
	The replacement was performed automatically by these commands: perl -pi -e 's/link:(git.+)\.html\[\1\]/gitlink:$1\[1\]/g' \ README Documentation/.txt perl -pi -e 's/link:git\.html\[git\]/gitlink:git\[7\]/g' \ README Documentation/.txt Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-02	Document hooks.	Junio C Hamano	1	-0/+6
	Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-29	Accumulated documentation updates.	Junio C Hamano	1	-7/+47
	Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-23	Add placeholders for missing documents.	Junio C Hamano	1	-0/+38
	The text does not say anything interesting, but at least the author list should reflect something close to reality. Signed-off-by: Junio C Hamano <junkio@cox.net>