git-am.txt: clarify --abort behavior

[thirdparty/git.git] / Documentation / git-am.txt

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index decd8ae12278cac8f3ea5e7dc9f1fb15b95629bd..0a4a984dfdecda8ef5d252e2a2883f6497f2cb1b 100644 (file)
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -15,6 +15,7 @@ SYNOPSIS
         [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
         [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
         [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]
+        [--quoted-cr=<action>]
         [(<mbox> | <Maildir>)...]
 'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])
 
@@ -59,6 +60,9 @@ OPTIONS
 --no-scissors::
        Ignore scissors lines (see linkgit:git-mailinfo[1]).
 
+--quoted-cr=<action>::
+       This flag will be passed down to 'git mailinfo' (see linkgit:git-mailinfo[1]).
+
 -m::
 --message-id::
        Pass the `-m` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]),
@@ -174,6 +178,8 @@ default.   You can use `--no-utf8` to override this.
 
 --abort::
        Restore the original branch and abort the patching operation.
+       Revert contents of files involved in the am operation to their
+       pre-am state.
 
 --quit::
        Abort the patching operation but keep HEAD and the index