merge, pull: introduce '--(no-)stat' option
[git/git.git] / Documentation / merge-options.txt
... / ...
CommitLineData
1--stat::
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-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--no-commit::
13 Perform the merge but pretend the merge failed and do
14 not autocommit, to give the user a chance to inspect and
15 further tweak the merge result before committing.
16
17--commit::
18 Perform the merge and commit the result. This option can
19 be used to override --no-commit.
20
21--squash::
22 Produce the working tree and index state as if a real
23 merge happened, but do not actually make a commit or
24 move the `HEAD`, nor record `$GIT_DIR/MERGE_HEAD` to
25 cause the next `git commit` command to create a merge
26 commit. This allows you to create a single commit on
27 top of the current branch whose effect is the same as
28 merging another branch (or more in case of an octopus).
29
30--no-squash::
31 Perform the merge and commit the result. This option can
32 be used to override --squash.
33
34--no-ff::
35 Generate a merge commit even if the merge resolved as a
36 fast-forward.
37
38--ff::
39 Do not generate a merge commit if the merge resolved as
40 a fast-forward, only update the branch pointer. This is
41 the default behavior of git-merge.
42
43-s <strategy>, \--strategy=<strategy>::
44 Use the given merge strategy; can be supplied more than
45 once to specify them in the order they should be tried.
46 If there is no `-s` option, a built-in list of strategies
47 is used instead (`git-merge-recursive` when merging a single
48 head, `git-merge-octopus` otherwise).