summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-03-05 22:28:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-03-05 22:28:14 (GMT)
commitbb8cbe7861546a0646d38d7cd49dc245001ec5c5 (patch)
tree926a5f279c1ab6036e440dd9813f3544aba2ec67
parent0e20414f106e22fb13aa4d00201dbeb7422b83fb (diff)
parent690b29758289ac81062159c178b6d917f06e9862 (diff)
downloadgit-bb8cbe7861546a0646d38d7cd49dc245001ec5c5.zip
git-bb8cbe7861546a0646d38d7cd49dc245001ec5c5.tar.gz
git-bb8cbe7861546a0646d38d7cd49dc245001ec5c5.tar.bz2
Merge branch 'jc/doc-merge-options' into maint
* jc/doc-merge-options: Documentation/merge-options.txt: group "ff" related options together
-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