Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule-changes'

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 87781f4a7789c8cc9be03e77b0cfe37b13c6e9c0..67ad5da9cc0e766882300e90ed114306cb3c9fa7 100644 (file)
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -13,7 +13,7 @@ SYNOPSIS
         [--3way] [--interactive] [--committer-date-is-author-date]
         [--ignore-date] [--ignore-space-change | --ignore-whitespace]
         [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
-        [--reject] [-q | --quiet] [--scissors]
+        [--reject] [-q | --quiet] [--scissors | --no-scissors]
         [<mbox> | <Maildir>...]
 'git am' (--skip | --resolved | --abort)
 
@@ -44,6 +44,9 @@ OPTIONS
        Remove everything in body before a scissors line (see
        linkgit:git-mailinfo[1]).
 
+---no-scissors::
+       Ignore scissors lines (see linkgit:git-mailinfo[1]).
+
 -q::
 --quiet::
        Be quiet. Only print error messages.