Git 1.9.1
[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 10--edit::
66fa1b2c 11-e::
f8246281
JH
12--no-edit::
13 Invoke an editor before committing successful mechanical merge to
14 further edit the auto-generated merge message, so that the user
15 can explain and justify the merge. The `--no-edit` option can be
16 used to accept the auto-generated message (this is generally
08f19cfe
JH
17 discouraged).
18ifndef::git-pull[]
19The `--edit` (or `-e`) option is still useful if you are
20giving a draft message with the `-m` option from the command line
21and want to edit it in the editor.
22endif::git-pull[]
66f4b98a 23+
f8246281
JH
24Older scripts may depend on the historical behaviour of not allowing the
25user to edit the merge log message. They will see an editor opened when
26they run `git merge`. To make it easier to adjust such scripts to the
27updated behaviour, the environment variable `GIT_MERGE_AUTOEDIT` can be
28set to `no` at the beginning of them.
66f4b98a 29
7c85d274 30--ff::
690b2975
JH
31 When the merge resolves as a fast-forward, only update the branch
32 pointer, without creating a merge commit. This is the default
33 behavior.
34
7c85d274 35--no-ff::
690b2975 36 Create a merge commit even when the merge resolves as a
77c72780
JH
37 fast-forward. This is the default behaviour when merging an
38 annotated (and possibly signed) tag.
690b2975
JH
39
40--ff-only::
41 Refuse to merge and exit with a non-zero status unless the
42 current `HEAD` is already up-to-date or the merge can be
43 resolved as a fast-forward.
d8abe148 44
96e9420c 45--log[=<n>]::
7c85d274 46--no-log::
efb779f8 47 In addition to branch names, populate the log message with
96e9420c
RR
48 one-line descriptions from at most <n> actual commits that are being
49 merged. See also linkgit:git-fmt-merge-msg[1].
7c85d274
JA
50+
51With --no-log do not list one-line descriptions from the
52actual commits being merged.
efb779f8 53
93d69d86 54
7c85d274
JA
55--stat::
56-n::
57--no-stat::
58 Show a diffstat at the end of the merge. The diffstat is also
59 controlled by the configuration option merge.stat.
60+
61With -n or --no-stat do not show a diffstat at the end of the
62merge.
d08af0ad 63
7d0c6887 64--squash::
7c85d274 65--no-squash::
7d0c6887 66 Produce the working tree and index state as if a real
f5d4c4d0
MG
67 merge happened (except for the merge information),
68 but do not actually make a commit or
7d0c6887
JH
69 move the `HEAD`, nor record `$GIT_DIR/MERGE_HEAD` to
70 cause the next `git commit` command to create a merge
71 commit. This allows you to create a single commit on
72 top of the current branch whose effect is the same as
73 merging another branch (or more in case of an octopus).
7c85d274
JA
74+
75With --no-squash perform the merge and commit the result. This
76option can be used to override --squash.
d66424c4 77
3240240f
SB
78-s <strategy>::
79--strategy=<strategy>::
93d69d86
JL
80 Use the given merge strategy; can be supplied more than
81 once to specify them in the order they should be tried.
82 If there is no `-s` option, a built-in list of strategies
0b444cdb
TR
83 is used instead ('git merge-recursive' when merging a single
84 head, 'git merge-octopus' otherwise).
7c85d274 85
adda3c3b
MB
86-X <option>::
87--strategy-option=<option>::
88 Pass merge strategy specific option through to the merge
89 strategy.
90
efed0022
SG
91--verify-signatures::
92--no-verify-signatures::
eb307ae7
SG
93 Verify that the commits being merged have good and trusted GPG signatures
94 and abort the merge in case they do not.
efed0022 95
7c85d274
JA
96--summary::
97--no-summary::
98 Synonyms to --stat and --no-stat; these are deprecated and will be
99 removed in the future.
100
409b8d82 101ifndef::git-pull[]
7c85d274
JA
102-q::
103--quiet::
99bfc669 104 Operate quietly. Implies --no-progress.
7c85d274
JA
105
106-v::
107--verbose::
108 Be verbose.
99bfc669
JK
109
110--progress::
111--no-progress::
112 Turn progress on/off explicitly. If neither is specified,
113 progress is shown if standard error is connected to a terminal.
114 Note that not all merge strategies may support progress
115 reporting.
116
409b8d82 117endif::git-pull[]