diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-30 14:43:24 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-30 14:43:24 -0800 |
| commit | d268cb940d6d299cbb7c77328c2f51843b0883df (patch) | |
| tree | 234fc3d4794da01379afa3dbd55e472d463148c4 /Documentation/git-mailinfo.txt | |
| parent | 0c7cc135c52b7c573710f247fc55ea1bf677f1bc (diff) | |
| parent | 17635fc900674037bcaa9ca0fadcc5c23d6162e9 (diff) | |
| download | git-d268cb940d6d299cbb7c77328c2f51843b0883df.tar.gz | |
Merge branch 'jc/mailinfo-remove-brackets'
Conflicts:
Documentation/git-mailinfo.txt
builtin-mailinfo.c
Diffstat (limited to 'Documentation/git-mailinfo.txt')
| -rw-r--r-- | Documentation/git-mailinfo.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt index 996c3fcc6c..b81ac98cf0 100644 --- a/Documentation/git-mailinfo.txt +++ b/Documentation/git-mailinfo.txt @@ -8,7 +8,7 @@ git-mailinfo - Extracts patch and authorship from a single e-mail message SYNOPSIS -------- -'git mailinfo' [-k] [-u | --encoding=<encoding> | -n] [--scissors] <msg> <patch> +'git mailinfo' [-k|-b] [-u | --encoding=<encoding> | -n] [--scissors] <msg> <patch> DESCRIPTION @@ -32,6 +32,11 @@ OPTIONS munging, and is most useful when used to read back 'git-format-patch -k' output. +-b:: + When -k is not in effect, all leading strings bracketed with '[' + and ']' pairs are stripped. This option limits the stripping to + only the pairs whose bracketed string contains the word "PATCH". + -u:: The commit log message, author name and author email are taken from the e-mail, and after minimally decoding MIME |