completion: don't set PARSE_OPT_NOCOMPLETE on --rerere-autoupdate

diff --git a/Documentation/git.txt b/Documentation/git.txt
index e75db104e3a33dde93a98cc09de97f4d4f0bc5eb..3f4161a799300c55e17fec86e2debe503e6ec903 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -736,6 +736,15 @@ corresponding standard handle, and if `GIT_REDIRECT_STDERR` is
 `2>&1`, standard error will be redirected to the same handle as
 standard output.
 
+`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)::
+       If set to `yes`, print an ellipsis following an
+       (abbreviated) SHA-1 value.  This affects indications of
+       detached HEADs (linkgit:git-checkout[1]) and the raw
+       diff output (linkgit:git-diff[1]).  Printing an
+       ellipsis in the cases mentioned is no longer considered
+       adequate and support for it is likely to be removed in the
+       foreseeable future (along with the variable).
+
 Discussion[[Discussion]]
 ------------------------