diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-09-25 10:39:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-25 10:39:56 -0700 |
| commit | b1bb02dede05e26ae39908ae4ad35f011583bd50 (patch) | |
| tree | a804bdd9651232b18c056e7217557bd21cd9f6b0 /Documentation/git-merge-file.txt | |
| parent | Merge branch 'po/maint-docs' (diff) | |
| parent | mailinfo: do not concatenate charset= attribute values from mime headers (diff) | |
| download | tgif-b1bb02dede05e26ae39908ae4ad35f011583bd50.tar.xz | |
Merge branch 'jc/maint-mailinfo-mime-attr'
When "git am" is fed an input that has multiple "Content-type: ..."
header, it did not grok charset= attribute correctly.
* jc/maint-mailinfo-mime-attr:
mailinfo: do not concatenate charset= attribute values from mime headers
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions