1-n, \--no-summary:: 2 Do not show diffstat at the end of the merge. 3 4--no-commit:: 5 Perform the merge but pretend the merge failed and do 6 not autocommit, to give the user a chance to inspect and 7 further tweak the merge result before committing. 8 9 10-s <strategy>, \--strategy=<strategy>:: 11 Use the given merge strategy; can be supplied more than 12 once to specify them in the order they should be tried. 13 If there is no `-s` option, a built-in list of strategies 14 is used instead (`git-merge-recursive` when merging a single 15 head, `git-merge-octopus` otherwise). 16