summaryrefslogtreecommitdiff
path: root/Documentation/git-am.txt
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2016-06-05 04:46:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-06-06 18:40:15 (GMT)
commitd9925d1a714a440f4063f64e1bd776194d2dd918 (patch)
tree9fa4ce3c6e7ece9ce5212e7e62820be0eb35973b /Documentation/git-am.txt
parentc88098d7f19c6322fbd911bb89e2efd246bf75c4 (diff)
downloadgit-d9925d1a714a440f4063f64e1bd776194d2dd918.zip
git-d9925d1a714a440f4063f64e1bd776194d2dd918.tar.gz
git-d9925d1a714a440f4063f64e1bd776194d2dd918.tar.bz2
am: support --patch-format=mboxrd
Combined with "git format-patch --pretty=mboxrd", this should allow us to round-trip commit messages with embedded mbox "From " lines without corruption. Signed-off-by: Eric Wong <e@80x24.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-am.txt')
-rw-r--r--Documentation/git-am.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 13cdd7f..6348c29 100644
--- 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::