Merge branch 'hv/submodule-find-ff-merge'

diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index bd919f2dfddc0165f7749e425a9b1d393558d46f..a7c8174d01810bfb28e331aafc27414dd6cfad50 100644 (file)
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -140,6 +140,12 @@ a space) at the start of each line:
        lines, show only a partial prefix.
        Non default number of digits can be specified with --abbrev=<n>.
 
+--debug::
+       After each line that describes a file, add more data about its
+       cache entry.  This is intended to show as much information as
+       possible for manual inspection; the exact format may change at
+       any time.
+
 \--::
        Do not interpret any more arguments as options.