X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fmerge-config.txt;h=861bd6f55352a12db6d1d680508e1d02a8e90d12;hb=a12c6b0149e3dadd0701dac4fd0ba2463d251650;hp=8920258baa515b048555be3448edea0403ce05be;hpb=69d61daec7a7915f6a664f32002fd9403e7f2a34;p=git.git

diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 8920258ba..861bd6f55 100644
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -16,6 +16,16 @@ merge.defaultToUpstream::
 	to their corresponding remote tracking branches, and the tips of
 	these tracking branches are merged.
 
+merge.ff::
+	By default, git does not create an extra merge commit when merging
+	a commit that is a descendant of the current commit. Instead, the
+	tip of the current branch is fast-forwarded. When set to `false`,
+	this variable tells git to create an extra merge commit in such
+	a case (equivalent to giving the `--no-ff` option from the command
+	line). When set to `only`, only such fast-forward merges are
+	allowed (equivalent to giving the `--ff-only` option from the
+	command line).
+
 merge.log::
 	In addition to branch names, populate the log message with at
 	most the specified number of one-line descriptions from the