summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
blob: eebaf3aaffa72996ac8bdbc8e9498814cd99f506 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
-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).