t, doc: update tests, reference for "--force-if-includes"

[thirdparty/git.git] / Documentation / config / push.txt

diff --git a/Documentation/config/push.txt b/Documentation/config/push.txt
index f5e5b38c6889e92d5366e7be1140db57e8f708c4..21b256e0a4ec8af1dd1227ec2408ff924f988233 100644 (file)
--- a/Documentation/config/push.txt
+++ b/Documentation/config/push.txt
@@ -114,3 +114,9 @@ push.recurseSubmodules::
        specifying '--recurse-submodules=check|on-demand|no'.
        If not set, 'no' is used by default, unless 'submodule.recurse' is
        set (in which case a 'true' value means 'on-demand').
+
+push.useForceIfIncludes::
+       If set to "true", it is equivalent to specifying
+       `--force-if-includes` as an option to linkgit:git-push[1]
+       in the command line. Adding `--no-force-if-includes` at the
+       time of push overrides this configuration setting.