2009-10-22 19:25:20 +00:00
|
|
|
--commit::
|
|
|
|
--no-commit::
|
|
|
|
Perform the merge and commit the result. This option can
|
|
|
|
be used to override --no-commit.
|
|
|
|
+
|
2019-02-21 17:50:29 +00:00
|
|
|
With --no-commit perform the merge and stop just before creating
|
|
|
|
a merge commit, to give the user a chance to inspect and further
|
|
|
|
tweak the merge result before committing.
|
|
|
|
+
|
|
|
|
Note that fast-forward updates do not create a merge commit and
|
|
|
|
therefore there is no way to stop those merges with --no-commit.
|
|
|
|
Thus, if you want to ensure your branch is not changed or updated
|
|
|
|
by the merge command, use --no-ff with --no-commit.
|
2005-11-07 05:30:56 +00:00
|
|
|
|
2011-10-08 18:39:52 +00:00
|
|
|
--edit::
|
2013-05-16 22:26:00 +00:00
|
|
|
-e::
|
2012-01-11 06:44:45 +00:00
|
|
|
--no-edit::
|
|
|
|
Invoke an editor before committing successful mechanical merge to
|
|
|
|
further edit the auto-generated merge message, so that the user
|
|
|
|
can explain and justify the merge. The `--no-edit` option can be
|
|
|
|
used to accept the auto-generated message (this is generally
|
2014-01-14 18:26:21 +00:00
|
|
|
discouraged).
|
|
|
|
ifndef::git-pull[]
|
|
|
|
The `--edit` (or `-e`) option is still useful if you are
|
|
|
|
giving a draft message with the `-m` option from the command line
|
|
|
|
and want to edit it in the editor.
|
|
|
|
endif::git-pull[]
|
2011-10-08 18:39:52 +00:00
|
|
|
+
|
2012-01-11 06:44:45 +00:00
|
|
|
Older scripts may depend on the historical behaviour of not allowing the
|
|
|
|
user to edit the merge log message. They will see an editor opened when
|
|
|
|
they run `git merge`. To make it easier to adjust such scripts to the
|
|
|
|
updated behaviour, the environment variable `GIT_MERGE_AUTOEDIT` can be
|
|
|
|
set to `no` at the beginning of them.
|
2011-10-08 18:39:52 +00:00
|
|
|
|
2009-10-22 19:25:20 +00:00
|
|
|
--ff::
|
2012-02-22 22:27:07 +00:00
|
|
|
When the merge resolves as a fast-forward, only update the branch
|
|
|
|
pointer, without creating a merge commit. This is the default
|
|
|
|
behavior.
|
|
|
|
|
2009-10-22 19:25:20 +00:00
|
|
|
--no-ff::
|
2012-02-22 22:27:07 +00:00
|
|
|
Create a merge commit even when the merge resolves as a
|
2013-03-21 21:57:48 +00:00
|
|
|
fast-forward. This is the default behaviour when merging an
|
2018-02-14 18:18:55 +00:00
|
|
|
annotated (and possibly signed) tag that is not stored in
|
|
|
|
its natural place in 'refs/tags/' hierarchy.
|
2012-02-22 22:27:07 +00:00
|
|
|
|
|
|
|
--ff-only::
|
|
|
|
Refuse to merge and exit with a non-zero status unless the
|
2017-08-23 17:49:35 +00:00
|
|
|
current `HEAD` is already up to date or the merge can be
|
2012-02-22 22:27:07 +00:00
|
|
|
resolved as a fast-forward.
|
2008-04-06 01:23:43 +00:00
|
|
|
|
2017-10-12 09:02:17 +00:00
|
|
|
-S[<keyid>]::
|
|
|
|
--gpg-sign[=<keyid>]::
|
|
|
|
GPG-sign the resulting merge commit. The `keyid` argument is
|
|
|
|
optional and defaults to the committer identity; if specified,
|
|
|
|
it must be stuck to the option without a space.
|
|
|
|
|
2010-09-08 17:59:54 +00:00
|
|
|
--log[=<n>]::
|
2009-10-22 19:25:20 +00:00
|
|
|
--no-log::
|
2008-04-06 01:23:46 +00:00
|
|
|
In addition to branch names, populate the log message with
|
2010-09-08 17:59:54 +00:00
|
|
|
one-line descriptions from at most <n> actual commits that are being
|
|
|
|
merged. See also linkgit:git-fmt-merge-msg[1].
|
2009-10-22 19:25:20 +00:00
|
|
|
+
|
|
|
|
With --no-log do not list one-line descriptions from the
|
|
|
|
actual commits being merged.
|
2008-04-06 01:23:46 +00:00
|
|
|
|
2017-10-12 18:35:42 +00:00
|
|
|
--signoff::
|
|
|
|
--no-signoff::
|
|
|
|
Add Signed-off-by line by the committer at the end of the commit
|
|
|
|
log message. The meaning of a signoff depends on the project,
|
|
|
|
but it typically certifies that committer has
|
|
|
|
the rights to submit this work under the same license and
|
|
|
|
agrees to a Developer Certificate of Origin
|
|
|
|
(see http://developercertificate.org/ for more information).
|
|
|
|
+
|
|
|
|
With --no-signoff do not add a Signed-off-by line.
|
2005-11-07 05:30:56 +00:00
|
|
|
|
2009-10-22 19:25:20 +00:00
|
|
|
--stat::
|
|
|
|
-n::
|
|
|
|
--no-stat::
|
|
|
|
Show a diffstat at the end of the merge. The diffstat is also
|
|
|
|
controlled by the configuration option merge.stat.
|
|
|
|
+
|
|
|
|
With -n or --no-stat do not show a diffstat at the end of the
|
|
|
|
merge.
|
2007-09-23 22:51:44 +00:00
|
|
|
|
git-merge --squash
Some people tend to do many little commits on a topic branch,
recording all the trials and errors, and when the topic is
reasonably cooked well, would want to record the net effect of
the series as one commit on top of the mainline, removing the
cruft from the history. The topic is then abandoned or forked
off again from that point at the mainline.
The barebone porcelainish that comes with core git tools does
not officially support such operation, but you can fake it by
using "git pull --no-merge" when such a topic branch is not a
strict superset of the mainline, like this:
git checkout mainline
git pull --no-commit . that-topic-branch
: fix conflicts if any
rm -f .git/MERGE_HEAD
git commit -a -m 'consolidated commit log message'
git branch -f that-topic-branch ;# now fully merged
This however does not work when the topic branch is a fast
forward of the mainline, because normal "git pull" will never
create a merge commit in such a case, and there is nothing
special --no-commit could do to begin with.
This patch introduces a new option, --squash, to support such a
workflow officially in both fast-forward case and true merge
case. The user-level operation would be the same in both cases:
git checkout mainline
git pull --squash . that-topic-branch
: fix conflicts if any -- naturally, there would be
: no conflict if fast forward.
git commit -a -m 'consolidated commit log message'
git branch -f that-topic-branch ;# now fully merged
When the current branch is already up-to-date with respect to
the other branch, there truly is nothing to do, so the new
option does not have any effect.
This was brought up in #git IRC channel recently.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-23 08:37:02 +00:00
|
|
|
--squash::
|
2009-10-22 19:25:20 +00:00
|
|
|
--no-squash::
|
2014-03-31 22:11:44 +00:00
|
|
|
Produce the working tree and index state as if a real merge
|
|
|
|
happened (except for the merge information), but do not actually
|
|
|
|
make a commit, move the `HEAD`, or record `$GIT_DIR/MERGE_HEAD`
|
|
|
|
(to cause the next `git commit` command to create a merge
|
|
|
|
commit). This allows you to create a single commit on top of
|
|
|
|
the current branch whose effect is the same as merging another
|
|
|
|
branch (or more in case of an octopus).
|
2009-10-22 19:25:20 +00:00
|
|
|
+
|
|
|
|
With --no-squash perform the merge and commit the result. This
|
|
|
|
option can be used to override --squash.
|
2007-09-23 22:51:45 +00:00
|
|
|
|
2008-06-08 01:36:09 +00:00
|
|
|
-s <strategy>::
|
|
|
|
--strategy=<strategy>::
|
2005-11-07 05:30:56 +00:00
|
|
|
Use the given merge strategy; can be supplied more than
|
|
|
|
once to specify them in the order they should be tried.
|
|
|
|
If there is no `-s` option, a built-in list of strategies
|
2010-01-09 23:33:00 +00:00
|
|
|
is used instead ('git merge-recursive' when merging a single
|
|
|
|
head, 'git merge-octopus' otherwise).
|
2009-10-22 19:25:20 +00:00
|
|
|
|
2010-04-12 16:28:13 +00:00
|
|
|
-X <option>::
|
|
|
|
--strategy-option=<option>::
|
|
|
|
Pass merge strategy specific option through to the merge
|
|
|
|
strategy.
|
|
|
|
|
2013-03-31 16:02:24 +00:00
|
|
|
--verify-signatures::
|
|
|
|
--no-verify-signatures::
|
2016-05-13 09:51:01 +00:00
|
|
|
Verify that the tip commit of the side branch being merged is
|
|
|
|
signed with a valid key, i.e. a key that has a valid uid: in the
|
|
|
|
default trust model, this means the signing key has been signed by
|
|
|
|
a trusted key. If the tip commit of the side branch is not signed
|
|
|
|
with a valid key, the merge is aborted.
|
2013-03-31 16:02:24 +00:00
|
|
|
|
2009-10-22 19:25:20 +00:00
|
|
|
--summary::
|
|
|
|
--no-summary::
|
|
|
|
Synonyms to --stat and --no-stat; these are deprecated and will be
|
|
|
|
removed in the future.
|
|
|
|
|
2010-02-24 12:50:21 +00:00
|
|
|
ifndef::git-pull[]
|
2009-10-22 19:25:20 +00:00
|
|
|
-q::
|
|
|
|
--quiet::
|
2011-02-20 09:53:21 +00:00
|
|
|
Operate quietly. Implies --no-progress.
|
2009-10-22 19:25:20 +00:00
|
|
|
|
|
|
|
-v::
|
|
|
|
--verbose::
|
|
|
|
Be verbose.
|
2011-02-20 09:53:21 +00:00
|
|
|
|
|
|
|
--progress::
|
|
|
|
--no-progress::
|
|
|
|
Turn progress on/off explicitly. If neither is specified,
|
|
|
|
progress is shown if standard error is connected to a terminal.
|
|
|
|
Note that not all merge strategies may support progress
|
|
|
|
reporting.
|
|
|
|
|
2010-02-24 12:50:21 +00:00
|
|
|
endif::git-pull[]
|
2016-03-18 20:21:09 +00:00
|
|
|
|
|
|
|
--allow-unrelated-histories::
|
|
|
|
By default, `git merge` command refuses to merge histories
|
|
|
|
that do not share a common ancestor. This option can be
|
|
|
|
used to override this safety when merging histories of two
|
|
|
|
projects that started their lives independently. As that is
|
|
|
|
a very rare occasion, no configuration variable to enable
|
|
|
|
this by default exists and will not be added.
|