pull: check if in unresolved merge state

diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index 6bc296787e99f1e5fee159a99aba89f6035b6265..1a296bc29a16fcf4ee6b581310033861c1ec82bc 100644 (file)
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -178,6 +178,12 @@ may not support it yet.
        system must change `st_mtime` field of a directory if files
        are added or deleted in that directory.
 
+--force-untracked-cache::
+       For safety, `--untracked-cache` performs tests on the working
+       directory to make sure untracked cache can be used. These
+       tests can take a few seconds. `--force-untracked-cache` can be
+       used to skip the tests.
+
 \--::
        Do not interpret any more arguments as options.