summaryrefslogtreecommitdiff
path: root/Documentation/howto/revert-a-faulty-merge.txt
diff options
context:
space:
mode:
authorLibravatar Jonathan Tan <jonathantanmy@google.com>2016-10-21 10:55:03 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-10-21 11:48:35 -0700
commit60ef86a16268bfb1efb28bcb3f1b646bfad1931c (patch)
tree189c2f5488d8c8a92164e077eb091f74cbf94a49 /Documentation/howto/revert-a-faulty-merge.txt
parenttrailer: forbid leading whitespace in trailers (diff)
downloadtgif-60ef86a16268bfb1efb28bcb3f1b646bfad1931c.tar.xz
trailer: support values folded to multiple lines
Currently, interpret-trailers requires that a trailer be only on 1 line. For example: a: first line second line would be interpreted as one trailer line followed by one non-trailer line. Make interpret-trailers support RFC 822-style folding, treating those lines as one logical trailer. Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/howto/revert-a-faulty-merge.txt')
0 files changed, 0 insertions, 0 deletions