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