Documentation/merge-options.txt: group "ff" related options together
The --ff-only option was not described next to --ff and --no-ff options in "git merge" documentation, even though these three are logically together, describing how to choose one of three possibilities. Also the description for '--ff' and '--no-ff' discussed what '--ff' means, and mentioned '--no-ff' as if it were a side-note to '--ff'. Make them into three top-level entries and list them together. This way, it would be more clear that the user can choose one from these three. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Feb 22, 2012 at 14:27 UTC
690b29758289ac81062159c178b6d917f06e9862
1 file changed
+11
-11
Documentation/merge-options.txt
+11
-11
@@ -13,13 +13,18 @@ inspect and further tweak the merge result before committing.
13
edit the default merge message.
14
15
--ff::
16
+ When the merge resolves as a fast-forward, only update the branch
17
+ pointer, without creating a merge commit. This is the default
18
+ behavior.
19
+
20
--no-ff::
17
- Do not generate a merge commit if the merge resolved as
18
- a fast-forward, only update the branch pointer. This is
19
- the default behavior of git-merge.
20
-+
21
-With --no-ff Generate a merge commit even if the merge
22
-resolved as a fast-forward.
21
+ Create a merge commit even when the merge resolves as a
22
+ fast-forward.
23
+
24
+--ff-only::
25
+ Refuse to merge and exit with a non-zero status unless the
26
+ current `HEAD` is already up-to-date or the merge can be
27
+ resolved as a fast-forward.
28
29
--log[=<n>]::
30
--no-log::
@@ -54,11 +59,6 @@ merge.
59
With --no-squash perform the merge and commit the result. This
60
option can be used to override --squash.
61
57
---ff-only::
58
- Refuse to merge and exit with a non-zero status unless the
59
- current `HEAD` is already up-to-date or the merge can be
60
- resolved as a fast-forward.
61
-
62
-s <strategy>::
63
--strategy=<strategy>::
64
Use the given merge strategy; can be supplied more than