Documentation/merge-options.txt

   1 --stat::
   2         Show a diffstat at the end of the merge. The diffstat is also
   3         controlled by the configuration option merge.stat.
   4
   5 -n, \--no-stat::
   6         Do not show diffstat at the end of the merge.
   7
   8 --summary, \--no-summary::
   9         Synonyms to --stat and --no-stat; these are deprecated and will be
  10         removed in the future.
  11
  12 --log::
  13         In addition to branch names, populate the log message with
  14         one-line descriptions from the actual commits that are being
  15         merged.
  16
  17 --no-log::
  18         Do not list one-line descriptions from the actual commits being
  19         merged.
  20
  21 --no-commit::
  22         Perform the merge but pretend the merge failed and do
  23         not autocommit, to give the user a chance to inspect and
  24         further tweak the merge result before committing.
  25
  26 --commit::
  27         Perform the merge and commit the result. This option can
  28         be used to override --no-commit.
  29
  30 --squash::
  31         Produce the working tree and index state as if a real
  32         merge happened, but do not actually make a commit or
  33         move the `HEAD`, nor record `$GIT_DIR/MERGE_HEAD` to
  34         cause the next `git commit` command to create a merge
  35         commit.  This allows you to create a single commit on
  36         top of the current branch whose effect is the same as
  37         merging another branch (or more in case of an octopus).
  38
  39 --no-squash::
  40         Perform the merge and commit the result. This option can
  41         be used to override --squash.
  42
  43 --no-ff::
  44         Generate a merge commit even if the merge resolved as a
  45         fast-forward.
  46
  47 --ff::
  48         Do not generate a merge commit if the merge resolved as
  49         a fast-forward, only update the branch pointer. This is
  50         the default behavior of git-merge.
  51
  52 -s <strategy>, \--strategy=<strategy>::
  53         Use the given merge strategy; can be supplied more than
  54         once to specify them in the order they should be tried.
  55         If there is no `-s` option, a built-in list of strategies
  56         is used instead (`git-merge-recursive` when merging a single
  57         head, `git-merge-octopus` otherwise).