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>
Jari Aalto committed
Oct 22, 2009 at 22:25 UTC
7c85d27429784c181ca633fb1465a9c651dbce8a
1 file changed
+45
-43
Documentation/merge-options.txt
+45
-43
@@ -1,43 +1,42 @@
1
--q::
2
---quiet::
3
- Operate quietly.
4
-
5
--v::
6
---verbose::
7
- Be verbose.
8
-
9
---stat::
10
- Show a diffstat at the end of the merge. The diffstat is also
11
- controlled by the configuration option merge.stat.
12
-
13
--n::
14
---no-stat::
15
- Do not show a diffstat at the end of the merge.
1
+--commit::
2
+--no-commit::
3
+ Perform the merge and commit the result. This option can
4
+ be used to override --no-commit.
5
++
6
+With --no-commit perform the merge but pretend the merge
7
+failed and do not autocommit, to give the user a chance to
8
+inspect and further tweak the merge result before committing.
9
17
---summary::
18
---no-summary::
19
- Synonyms to --stat and --no-stat; these are deprecated and will be
20
- removed in the future.
10
+--ff::
11
+--no-ff::
12
+ Do not generate a merge commit if the merge resolved as
13
+ a fast-forward, only update the branch pointer. This is
14
+ the default behavior of git-merge.
15
++
16
+With --no-ff Generate a merge commit even if the merge
17
+resolved as a fast-forward.
18
19
--log::
20
+--no-log::
21
In addition to branch names, populate the log message with
22
one-line descriptions from the actual commits that are being
23
merged.
24
++
25
+With --no-log do not list one-line descriptions from the
26
+actual commits being merged.
27
27
---no-log::
28
- Do not list one-line descriptions from the actual commits being
29
- merged.
30
-
31
---no-commit::
32
- Perform the merge but pretend the merge failed and do
33
- not autocommit, to give the user a chance to inspect and
34
- further tweak the merge result before committing.
28
36
---commit::
37
- Perform the merge and commit the result. This option can
38
- be used to override --no-commit.
29
+--stat::
30
+-n::
31
+--no-stat::
32
+ Show a diffstat at the end of the merge. The diffstat is also
33
+ controlled by the configuration option merge.stat.
34
++
35
+With -n or --no-stat do not show a diffstat at the end of the
36
+merge.
37
38
--squash::
39
+--no-squash::
40
Produce the working tree and index state as if a real
41
merge happened (except for the merge information),
42
but do not actually make a commit or
@@ -46,19 +45,9 @@
45
commit. This allows you to create a single commit on
46
top of the current branch whose effect is the same as
47
merging another branch (or more in case of an octopus).
49
-
50
---no-squash::
51
- Perform the merge and commit the result. This option can
52
- be used to override --squash.
53
-
54
---no-ff::
55
- Generate a merge commit even if the merge resolved as a
56
- fast-forward.
57
-
58
---ff::
59
- Do not generate a merge commit if the merge resolved as
60
- a fast-forward, only update the branch pointer. This is
61
- the default behavior of git-merge.
48
++
49
+With --no-squash perform the merge and commit the result. This
50
+option can be used to override --squash.
51
52
-s <strategy>::
53
--strategy=<strategy>::
@@ -67,3 +56,16 @@
56
If there is no `-s` option, a built-in list of strategies
57
is used instead ('git-merge-recursive' when merging a single
58
head, 'git-merge-octopus' otherwise).
59
+
60
+--summary::
61
+--no-summary::
62
+ Synonyms to --stat and --no-stat; these are deprecated and will be
63
+ removed in the future.
64
+
65
+-q::
66
+--quiet::
67
+ Operate quietly.
68
+
69
+-v::
70
+--verbose::
71
+ Be verbose.