tgif.git - Terin's Improved Git Fork

Age	Commit message (Collapse)	Author	Files	Lines
2012-10-16	Documentation/technical: convert plain text files to asciidoc	Thomas Ackermann	1	-18/+18
	These were not originally meant for asciidoc, but they are already so close. Mark them up in asciidoc. Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2005-09-24	[PATCH] Finish documenting trivial merge rules	Daniel Barkalow	1	-10/+39
	Fix missing symbol explanations, a few incorrect cases, and add two-way merge rules. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-10	[PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges.	Daniel Barkalow	1	-0/+92
	Signed-off-by: Daniel Barkalow Signed-off-by: Junio C Hamano <junkio@cox.net>