t/lib-submodule-update.sh: fix test ignoring ignored files in submodules

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 2552ab8e8d5104d09c1c95010ab028068c7d18ae..3888c3ff85e2dc5b137e4e3ed50e39327760a02a 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -57,6 +57,16 @@ set to `no` at the beginning of them.
 With --no-log do not list one-line descriptions from the
 actual commits being merged.
 
+--signoff::
+--no-signoff::
+       Add Signed-off-by line by the committer at the end of the commit
+       log message.  The meaning of a signoff depends on the project,
+       but it typically certifies that committer has
+       the rights to submit this work under the same license and
+       agrees to a Developer Certificate of Origin
+       (see http://developercertificate.org/ for more information).
++
+With --no-signoff do not add a Signed-off-by line.
 
 --stat::
 -n::