diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-07-13 15:45:38 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-07-13 15:45:38 -0700 |
commit | 447d0cca45920bbe409361bb532444f810c75546 (patch) | |
tree | 5dcc6d9b52da50102b842e57c1dbcd3c1274f475 /Documentation/git-mailinfo.txt | |
parent | fa6200fc02ad79124322b97fc26f79467789838f (diff) | |
parent | 191a8e32b38c7ff0dd884df7bd323b7a5bd4336c (diff) | |
download | git-447d0cca45920bbe409361bb532444f810c75546.tar.gz |
Merge branch 'maint' to sync with 1.5.6.3
* maint:
GIT 1.5.6.3
git-am: Do not exit silently if committer is unset
t0004: fix timing bug
git-mailinfo: document the -n option
Fix backwards-incompatible handling of core.sharedRepository
Diffstat (limited to 'Documentation/git-mailinfo.txt')
-rw-r--r-- | Documentation/git-mailinfo.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt index cc52db3bef..316bcc6796 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>] <msg> <patch> +'git mailinfo' [-k] [-u | --encoding=<encoding> | -n] <msg> <patch> DESCRIPTION @@ -46,6 +46,9 @@ conversion, even with this flag. from what is specified by i18n.commitencoding, this flag can be used to override it. +-n:: + Disable all charset re-coding of the metadata. + <msg>:: The commit log message extracted from e-mail, usually except the title line which comes from e-mail Subject. |