summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-22 22:27:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-02-22 23:56:27 (GMT)
commit690b29758289ac81062159c178b6d917f06e9862 (patch)
tree7d91c734db18d8fdb48c6f9dd7aa514c7302d615 /Documentation/merge-options.txt
parentd0482e88a735787f7bb33ef4783be0e7f6a70946 (diff)
downloadgit-690b29758289ac81062159c178b6d917f06e9862.zip
git-690b29758289ac81062159c178b6d917f06e9862.tar.gz
git-690b29758289ac81062159c178b6d917f06e9862.tar.bz2
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>
Diffstat (limited to 'Documentation/merge-options.txt')
-rw-r--r--Documentation/merge-options.txt22
1 files changed, 11 insertions, 11 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 1a5c12e..2bd92c4 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -13,13 +13,18 @@ inspect and further tweak the merge result before committing.
edit the default merge message.
--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::
- 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.
-+
-With --no-ff Generate a merge commit even if the merge
-resolved as a fast-forward.
+ Create a merge commit even when the merge resolves as a
+ fast-forward.
+
+--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.
--log[=<n>]::
--no-log::
@@ -54,11 +59,6 @@ merge.
With --no-squash perform the merge and commit the result. This
option can be used to override --squash.
---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 <strategy>::
--strategy=<strategy>::
Use the given merge strategy; can be supplied more than