Merge branch 'dl/flex-str-cocci'

diff --git a/t/README b/t/README
index e3652ff50b6df0209c94de82dd551460e5831172..af1243eb49efab5e5763c54e82697bf277be0adf 100644 (file)
--- a/t/README
+++ b/t/README
@@ -402,6 +402,10 @@ GIT_TEST_SIDEBAND_ALL=<boolean>, when true, overrides the
 fetch-pack to not request sideband-all (even if the server advertises
 sideband-all).
 
+GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=<boolean>, when true (which is
+the default when running tests), errors out when an abbreviated option
+is used.
+
 Naming Tests
 ------------