commit: do not lose mergetag header when not amending
[git/git.git] / Documentation / merge-options.txt
CommitLineData
7c85d274
JA
1--commit::
2--no-commit::
3 Perform the merge and commit the result. This option can
4 be used to override --no-commit.
5+
6With --no-commit perform the merge but pretend the merge
7failed and do not autocommit, to give the user a chance to
8inspect and further tweak the merge result before committing.
93d69d86 9
66f4b98a
JS
10--edit::
11-e::
12+
13 Invoke editor before committing successful merge to further
14 edit the default merge message.
15
7c85d274
JA
16--ff::
17--no-ff::
18 Do not generate a merge commit if the merge resolved as
19 a fast-forward, only update the branch pointer. This is
20 the default behavior of git-merge.
21+
22With --no-ff Generate a merge commit even if the merge
23resolved as a fast-forward.
d8abe148 24
96e9420c 25--log[=<n>]::
7c85d274 26--no-log::
efb779f8 27 In addition to branch names, populate the log message with
96e9420c
RR
28 one-line descriptions from at most <n> actual commits that are being
29 merged. See also linkgit:git-fmt-merge-msg[1].
7c85d274
JA
30+
31With --no-log do not list one-line descriptions from the
32actual commits being merged.
efb779f8 33
93d69d86 34
7c85d274
JA
35--stat::
36-n::
37--no-stat::
38 Show a diffstat at the end of the merge. The diffstat is also
39 controlled by the configuration option merge.stat.
40+
41With -n or --no-stat do not show a diffstat at the end of the
42merge.
d08af0ad 43
7d0c6887 44--squash::
7c85d274 45--no-squash::
7d0c6887 46 Produce the working tree and index state as if a real
f5d4c4d0
MG
47 merge happened (except for the merge information),
48 but do not actually make a commit or
7d0c6887
JH
49 move the `HEAD`, nor record `$GIT_DIR/MERGE_HEAD` to
50 cause the next `git commit` command to create a merge
51 commit. This allows you to create a single commit on
52 top of the current branch whose effect is the same as
53 merging another branch (or more in case of an octopus).
7c85d274
JA
54+
55With --no-squash perform the merge and commit the result. This
56option can be used to override --squash.
d66424c4 57
13474835
BG
58--ff-only::
59 Refuse to merge and exit with a non-zero status unless the
60 current `HEAD` is already up-to-date or the merge can be
61 resolved as a fast-forward.
62
3240240f
SB
63-s <strategy>::
64--strategy=<strategy>::
93d69d86
JL
65 Use the given merge strategy; can be supplied more than
66 once to specify them in the order they should be tried.
67 If there is no `-s` option, a built-in list of strategies
0b444cdb
TR
68 is used instead ('git merge-recursive' when merging a single
69 head, 'git merge-octopus' otherwise).
7c85d274 70
adda3c3b
MB
71-X <option>::
72--strategy-option=<option>::
73 Pass merge strategy specific option through to the merge
74 strategy.
75
7c85d274
JA
76--summary::
77--no-summary::
78 Synonyms to --stat and --no-stat; these are deprecated and will be
79 removed in the future.
80
409b8d82 81ifndef::git-pull[]
7c85d274
JA
82-q::
83--quiet::
99bfc669 84 Operate quietly. Implies --no-progress.
7c85d274
JA
85
86-v::
87--verbose::
88 Be verbose.
99bfc669
JK
89
90--progress::
91--no-progress::
92 Turn progress on/off explicitly. If neither is specified,
93 progress is shown if standard error is connected to a terminal.
94 Note that not all merge strategies may support progress
95 reporting.
96
409b8d82 97endif::git-pull[]