2 commits

Author	SHA1	Message	Date
Junio C Hamano	9688a882e1	Documentation: recursive is the default strategy these days. ... We still said resolve was the default in handful places. Signed-off-by: Junio C Hamano <junkio@cox.net>	2005-12-08 14:04:33 -08:00
Jon Loeliger	93d69d8691	Refactored merge options into separate merge-options.txt. ... Refactored fetch options into separate fetch-options.txt. Made git-merge use merge-options. Made git-fetch use fetch-options. Made git-pull use merge-options and fetch-options. Added --help option to git-pull and git-format-patch scripts. Rewrote Documentation/Makefile to dynamically determine include dependencies. Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>	2005-11-06 23:32:04 -08:00