summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2007-09-23 22:51:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-09-24 00:14:03 (GMT)
commitd66424c4ac661c69640765260235452499d80378 (patch)
tree26bfe8765b77b05e2d09653d433ffc6789ee3d4e /Documentation/merge-options.txt
parentd08af0ad745869a4fe36bc8df4f9804edfb74eb9 (diff)
downloadgit-d66424c4ac661c69640765260235452499d80378.zip
git-d66424c4ac661c69640765260235452499d80378.tar.gz
git-d66424c4ac661c69640765260235452499d80378.tar.bz2
git-merge: add --ff and --no-ff options
These new options can be used to control the policy for fast-forward merges: --ff allows it (this is the default) while --no-ff will create a merge commit. Signed-off-by: Lars Hjemli <hjemli@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
-rw-r--r--Documentation/merge-options.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 0464a34..9f1fc82 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -27,6 +27,15 @@
Perform the merge and commit the result. This option can
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>, \--strategy=<strategy>::
Use the given merge strategy; can be supplied more than
once to specify them in the order they should be tried.