https://github.com/git/git
Raw File
Tip revision: f7a2eb735982e921ae4379f1dcf5f7a023610393 authored by Junio C Hamano on 12 November 2005, 06:37:38 UTC
GIT 0.99.9h
Tip revision: f7a2eb7
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-resolve` when merging a single
	head, `git-merge-octopus` otherwise).

back to top