Documentation/merge-pull-opts.txt

   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 -s <strategy>::
  10         use that merge strategy; can be given more than once to
  11         specify them in the order they should be tried.  If
  12         there is no `-s` option, built-in list of strategies is
  13         used instead (`git-merge-resolve` when merging a single
  14         head, `git-merge-octopus` otherwise).