Documentation/merge-options.txt

   1 --summary::
   2         Show a diffstat at the end of the merge. The diffstat is also
   3         controlled by the configuration option merge.diffstat.
   4
   5 -n, \--no-summary::
   6         Do not show diffstat at the end of the merge.
   7
   8 --no-commit::
   9         Perform the merge but pretend the merge failed and do
  10         not autocommit, to give the user a chance to inspect and
  11         further tweak the merge result before committing.
  12
  13 --squash::
  14         Produce the working tree and index state as if a real
  15         merge happened, but do not actually make a commit or
  16         move the `HEAD`, nor record `$GIT_DIR/MERGE_HEAD` to
  17         cause the next `git commit` command to create a merge
  18         commit.  This allows you to create a single commit on
  19         top of the current branch whose effect is the same as
  20         merging another branch (or more in case of an octopus).
  21
  22 -s <strategy>, \--strategy=<strategy>::
  23         Use the given merge strategy; can be supplied more than
  24         once to specify them in the order they should be tried.
  25         If there is no `-s` option, a built-in list of strategies
  26         is used instead (`git-merge-recursive` when merging a single
  27         head, `git-merge-octopus` otherwise).