Merge branch 'ew/daemon-socket-keepalive'

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 8dd9e4f05252109de9435633b47c525b7d98e882..12879e4029a7710e2d78bae476f7ad7d9b0fe830 100644 (file)
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -116,7 +116,8 @@ default.   You can use `--no-utf8` to override this.
        By default the command will try to detect the patch format
        automatically. This option allows the user to bypass the automatic
        detection and specify the patch format that the patch(es) should be
-       interpreted as. Valid formats are mbox, stgit, stgit-series and hg.
+       interpreted as. Valid formats are mbox, mboxrd,
+       stgit, stgit-series and hg.
 
 -i::
 --interactive::