mirror of
https://github.com/git/git.git
synced 2024-11-25 10:54:00 +08:00
adcc94a0aa
Long time ago at fab47d05 ("merge: force edit and no-ff mode when
merging a tag object", 2011-11-07), "git merge" was made to always
create a merge commit when merging a tag, even when the side branch
being merged is a descendant of the current branch.
This default is good for merges made by upstream maintainers to
integrate work signed by downstream contributors, but will leave
pointless no-ff merges when downstream contributors pull a newer
release tag to make their long-running topic branches catch up with
the upstream. When there is no local work left on the topic, such a
merge should simply fast-forward to the commit pointed at by the
release tag.
Update the default (again) for "git merge" that merges a tag object
to (1) --no-ff (i.e. create a merge commit even when side branch
fast forwards) if the tag being merged is not at its expected place
in refs/tags/ hierarchy and (2) --ff (i.e. allow fast-forward update
when able) otherwise.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
145 lines
4.9 KiB
Plaintext
145 lines
4.9 KiB
Plaintext
--commit::
|
|
--no-commit::
|
|
Perform the merge and commit the result. This option can
|
|
be used to override --no-commit.
|
|
+
|
|
With --no-commit perform the merge but pretend the merge
|
|
failed and do not autocommit, to give the user a chance to
|
|
inspect and further tweak the merge result before committing.
|
|
|
|
--edit::
|
|
-e::
|
|
--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
|
|
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[]
|
|
+
|
|
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.
|
|
|
|
--ff::
|
|
When the merge resolves as a fast-forward, only update the branch
|
|
pointer, without creating a merge commit. This is the default
|
|
behavior.
|
|
|
|
--no-ff::
|
|
Create a merge commit even when the merge resolves as a
|
|
fast-forward. This is the default behaviour when merging an
|
|
annotated (and possibly signed) tag that is not stored in
|
|
its natural place in 'refs/tags/' hierarchy.
|
|
|
|
--ff-only::
|
|
Refuse to merge and exit with a non-zero status unless the
|
|
current `HEAD` is already up to date or the merge can be
|
|
resolved as a fast-forward.
|
|
|
|
-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.
|
|
|
|
--log[=<n>]::
|
|
--no-log::
|
|
In addition to branch names, populate the log message with
|
|
one-line descriptions from at most <n> actual commits that are being
|
|
merged. See also linkgit:git-fmt-merge-msg[1].
|
|
+
|
|
With --no-log do not list one-line descriptions from the
|
|
actual commits being merged.
|
|
|
|
--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.
|
|
|
|
--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.
|
|
|
|
--squash::
|
|
--no-squash::
|
|
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).
|
|
+
|
|
With --no-squash perform the merge and commit the result. This
|
|
option can be used to override --squash.
|
|
|
|
-s <strategy>::
|
|
--strategy=<strategy>::
|
|
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
|
|
is used instead ('git merge-recursive' when merging a single
|
|
head, 'git merge-octopus' otherwise).
|
|
|
|
-X <option>::
|
|
--strategy-option=<option>::
|
|
Pass merge strategy specific option through to the merge
|
|
strategy.
|
|
|
|
--verify-signatures::
|
|
--no-verify-signatures::
|
|
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.
|
|
|
|
--summary::
|
|
--no-summary::
|
|
Synonyms to --stat and --no-stat; these are deprecated and will be
|
|
removed in the future.
|
|
|
|
ifndef::git-pull[]
|
|
-q::
|
|
--quiet::
|
|
Operate quietly. Implies --no-progress.
|
|
|
|
-v::
|
|
--verbose::
|
|
Be verbose.
|
|
|
|
--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.
|
|
|
|
endif::git-pull[]
|
|
|
|
--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.
|