diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-10-31 13:15:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-31 13:15:22 -0700 |
| commit | cabb79d8c1c5e4f81f3435603f17c74480888395 (patch) | |
| tree | f0479b31521a15d897f26be85bdd6ffc7ab0c46a /git-mergetool.sh | |
| parent | dbaa6bdce22914843e956e36d41d328547514342 (diff) | |
| parent | 60ef86a16268bfb1efb28bcb3f1b646bfad1931c (diff) | |
| download | git-cabb79d8c1c5e4f81f3435603f17c74480888395.tar.gz git-cabb79d8c1c5e4f81f3435603f17c74480888395.tar.xz | |
Merge branch 'jt/trailer-with-cruft'
Update "interpret-trailers" machinery and teaches it that people in
real world write all sorts of crufts in the "trailer" that was
originally designed to have the neat-o "Mail-Header: like thing"
and nothing else.
* jt/trailer-with-cruft:
trailer: support values folded to multiple lines
trailer: forbid leading whitespace in trailers
trailer: allow non-trailers in trailer block
trailer: clarify failure modes in parse_trailer
trailer: make args have their own struct
trailer: streamline trailer item create and add
trailer: use list.h for doubly-linked list
trailer: improve const correctness
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions