mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Documentation/merge-options.txt: order options in alphabetical groups
Signed-off-by: Jari Aalto <jari.aalto@cante.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
3f7a9b5ad1
commit
7c85d27429
|
@ -1,43 +1,42 @@
|
||||||
-q::
|
--commit::
|
||||||
--quiet::
|
--no-commit::
|
||||||
Operate quietly.
|
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.
|
||||||
|
|
||||||
-v::
|
--ff::
|
||||||
--verbose::
|
--no-ff::
|
||||||
Be verbose.
|
Do not generate a merge commit if the merge resolved as
|
||||||
|
a fast-forward, only update the branch pointer. This is
|
||||||
--stat::
|
the default behavior of git-merge.
|
||||||
Show a diffstat at the end of the merge. The diffstat is also
|
+
|
||||||
controlled by the configuration option merge.stat.
|
With --no-ff Generate a merge commit even if the merge
|
||||||
|
resolved as a fast-forward.
|
||||||
-n::
|
|
||||||
--no-stat::
|
|
||||||
Do not show a diffstat at the end of the merge.
|
|
||||||
|
|
||||||
--summary::
|
|
||||||
--no-summary::
|
|
||||||
Synonyms to --stat and --no-stat; these are deprecated and will be
|
|
||||||
removed in the future.
|
|
||||||
|
|
||||||
--log::
|
--log::
|
||||||
|
--no-log::
|
||||||
In addition to branch names, populate the log message with
|
In addition to branch names, populate the log message with
|
||||||
one-line descriptions from the actual commits that are being
|
one-line descriptions from the actual commits that are being
|
||||||
merged.
|
merged.
|
||||||
|
+
|
||||||
|
With --no-log do not list one-line descriptions from the
|
||||||
|
actual commits being merged.
|
||||||
|
|
||||||
--no-log::
|
|
||||||
Do not list one-line descriptions from the actual commits being
|
|
||||||
merged.
|
|
||||||
|
|
||||||
--no-commit::
|
--stat::
|
||||||
Perform the merge but pretend the merge failed and do
|
-n::
|
||||||
not autocommit, to give the user a chance to inspect and
|
--no-stat::
|
||||||
further tweak the merge result before committing.
|
Show a diffstat at the end of the merge. The diffstat is also
|
||||||
|
controlled by the configuration option merge.stat.
|
||||||
--commit::
|
+
|
||||||
Perform the merge and commit the result. This option can
|
With -n or --no-stat do not show a diffstat at the end of the
|
||||||
be used to override --no-commit.
|
merge.
|
||||||
|
|
||||||
--squash::
|
--squash::
|
||||||
|
--no-squash::
|
||||||
Produce the working tree and index state as if a real
|
Produce the working tree and index state as if a real
|
||||||
merge happened (except for the merge information),
|
merge happened (except for the merge information),
|
||||||
but do not actually make a commit or
|
but do not actually make a commit or
|
||||||
|
@ -46,19 +45,9 @@
|
||||||
commit. This allows you to create a single commit on
|
commit. This allows you to create a single commit on
|
||||||
top of the current branch whose effect is the same as
|
top of the current branch whose effect is the same as
|
||||||
merging another branch (or more in case of an octopus).
|
merging another branch (or more in case of an octopus).
|
||||||
|
+
|
||||||
--no-squash::
|
With --no-squash perform the merge and commit the result. This
|
||||||
Perform the merge and commit the result. This option can
|
option can be used to override --squash.
|
||||||
be used to override --squash.
|
|
||||||
|
|
||||||
--no-ff::
|
|
||||||
Generate a merge commit even if the merge resolved as a
|
|
||||||
fast-forward.
|
|
||||||
|
|
||||||
--ff::
|
|
||||||
Do not generate a merge commit if the merge resolved as
|
|
||||||
a fast-forward, only update the branch pointer. This is
|
|
||||||
the default behavior of git-merge.
|
|
||||||
|
|
||||||
-s <strategy>::
|
-s <strategy>::
|
||||||
--strategy=<strategy>::
|
--strategy=<strategy>::
|
||||||
|
@ -67,3 +56,16 @@
|
||||||
If there is no `-s` option, a built-in list of strategies
|
If there is no `-s` option, a built-in list of strategies
|
||||||
is used instead ('git-merge-recursive' when merging a single
|
is used instead ('git-merge-recursive' when merging a single
|
||||||
head, 'git-merge-octopus' otherwise).
|
head, 'git-merge-octopus' otherwise).
|
||||||
|
|
||||||
|
--summary::
|
||||||
|
--no-summary::
|
||||||
|
Synonyms to --stat and --no-stat; these are deprecated and will be
|
||||||
|
removed in the future.
|
||||||
|
|
||||||
|
-q::
|
||||||
|
--quiet::
|
||||||
|
Operate quietly.
|
||||||
|
|
||||||
|
-v::
|
||||||
|
--verbose::
|
||||||
|
Be verbose.
|
||||||
|
|
Loading…
Reference in a new issue