summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
AgeCommit message (Collapse)Author
2005-12-08Documentation: recursive is the default strategy these days.Junio C Hamano
We still said resolve was the default in handful places. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-07Refactored merge options into separate merge-options.txt.Jon Loeliger
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>