git/Documentation/merge-options.txt

-n, \--no-summary::
	Do not show diffstat at the end of the merge.

--no-commit::
	Perform the merge but pretend the merge failed and do
	not autocommit, to give the user a chance to inspect and
	further tweak the merge result before committing.


-s <strategy>, \--strategy=<strategy>::
	Use the given merge strategy; can be supplied more than
	once to specify them in the order they should be tried.
	If there is no `-s` option, a built-in list of strategies
	is used instead (`git-merge-recursive` when merging a single
	head, `git-merge-octopus` otherwise).
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-07 05:30:56 +00:00			`-n, \--no-summary::`
			`Do not show diffstat at the end of the merge.`

			`--no-commit::`
			`Perform the merge but pretend the merge failed and do`
			`not autocommit, to give the user a chance to inspect and`
			`further tweak the merge result before committing.`


			`-s <strategy>, \--strategy=<strategy>::`
			`Use the given merge strategy; can be supplied more than`
			`once to specify them in the order they should be tried.`
			If there is no `-s` option, a built-in list of strategies
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 22:04:33 +00:00			is used instead (`git-merge-recursive` when merging a single
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-07 05:30:56 +00:00			head, `git-merge-octopus` otherwise).