Google Git
Sign in
chromium / external / gitster / git-htmldocs / 78b92a83bd6ee958f83152774f567569c3a78e53 / . / merge-options.txt
blob: 3b83dba1a0d8ad1436d15d164783f08593f54357 [file] [log] [blame]
Junio C Hamanoc21ab052009-10-31 04:03:55[diff] [blame]1--commit::
2--no-commit::
3Perform the merge and commit the result. This option can
4be 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.
Junio C Hamano610d1762008-11-28 06:27:13[diff] [blame]9
Junio C Hamanoc21ab052009-10-31 04:03:55[diff] [blame]10--ff::
11--no-ff::
12Do not generate a merge commit if the merge resolved as
13a fast-forward, only update the branch pointer. This is
14the default behavior of git-merge.
15+
16With --no-ff Generate a merge commit even if the merge
17resolved as a fast-forward.
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]18
19--log::
Junio C Hamanoc21ab052009-10-31 04:03:55[diff] [blame]20--no-log::
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]21In addition to branch names, populate the log message with
22one-line descriptions from the actual commits that are being
23merged.
Junio C Hamanoc21ab052009-10-31 04:03:55[diff] [blame]24+
25With --no-log do not list one-line descriptions from the
26actual commits being merged.
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]27
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]28
Junio C Hamanoc21ab052009-10-31 04:03:55[diff] [blame]29--stat::
30-n::
31--no-stat::
32Show a diffstat at the end of the merge. The diffstat is also
33controlled by the configuration option merge.stat.
34+
35With -n or --no-stat do not show a diffstat at the end of the
36merge.
Junio C Hamano1b50ce92007-10-03 12:05:53[diff] [blame]37
Junio C Hamano3901ffb2006-06-26 23:46:53[diff] [blame]38--squash::
Junio C Hamanoc21ab052009-10-31 04:03:55[diff] [blame]39--no-squash::
Junio C Hamano3901ffb2006-06-26 23:46:53[diff] [blame]40Produce the working tree and index state as if a real
Junio C Hamano9f10ed32009-05-26 08:38:52[diff] [blame]41merge happened (except for the merge information),
42but do not actually make a commit or
Junio C Hamano3901ffb2006-06-26 23:46:53[diff] [blame]43move the `HEAD`, nor record `$GIT_DIR/MERGE_HEAD` to
44cause the next `git commit` command to create a merge
45commit. This allows you to create a single commit on
46top of the current branch whose effect is the same as
47merging another branch (or more in case of an octopus).
Junio C Hamanoc21ab052009-10-31 04:03:55[diff] [blame]48+
49With --no-squash perform the merge and commit the result. This
50option can be used to override --squash.
Junio C Hamano1b50ce92007-10-03 12:05:53[diff] [blame]51
Junio C Hamano446ed772009-11-10 22:02:20[diff] [blame]52--ff-only::
53Refuse to merge and exit with a non-zero status unless the
54current `HEAD` is already up-to-date or the merge can be
55resolved as a fast-forward.
56
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]57-s <strategy>::
58--strategy=<strategy>::
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]59Use the given merge strategy; can be supplied more than
60once to specify them in the order they should be tried.
61If there is no `-s` option, a built-in list of strategies
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]62is used instead ('git merge-recursive' when merging a single
63head, 'git merge-octopus' otherwise).
Junio C Hamanoc21ab052009-10-31 04:03:55[diff] [blame]64
65--summary::
66--no-summary::
67Synonyms to --stat and --no-stat; these are deprecated and will be
68removed in the future.
69
70-q::
71--quiet::
72Operate quietly.
73
74-v::
75--verbose::
76Be verbose.
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]77
78-X <option>::
79--strategy-option=<option>::
80Pass merge strategy specific option through to the merge
81strategy.