Merge t4150-am-subdir.sh and t4151-am.sh into t4150-am.sh

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 01e7a578510f50af7365ec20e96d1538da424faa..859d67990a62049c2f328dfd676cf21da8ff9a27 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -83,7 +83,8 @@ endif::git-format-patch[]
        Show only names of changed files.
 
 --name-status::
-       Show only names and status of changed files.
+       Show only names and status of changed files. See the description
+       of the `--diff-filter` option on what the status letters mean.
 
 --color::
        Show colored diff.
@@ -227,6 +228,9 @@ endif::git-format-patch[]
 --no-ext-diff::
        Disallow external diff drivers.
 
+--ignore-submodules::
+       Ignore changes to submodules in the diff generation.
+
 --src-prefix=<prefix>::
        Show the given source prefix instead of "a/".