diff options
| author | Eric Wong <e@80x24.org> | 2016-06-05 04:46:41 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-06 11:40:15 -0700 |
| commit | d9925d1a714a440f4063f64e1bd776194d2dd918 (patch) | |
| tree | 9fa4ce3c6e7ece9ce5212e7e62820be0eb35973b /Documentation/git-am.txt | |
| parent | c88098d7f19c6322fbd911bb89e2efd246bf75c4 (diff) | |
| download | git-d9925d1a714a440f4063f64e1bd776194d2dd918.tar.gz | |
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.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 13cdd7f3b6..6348c29fea 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:: |