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