summaryrefslogtreecommitdiff
path: root/Documentation/config/mergetool.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-04-22 13:42:54 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-04-22 13:42:54 -0700
commitf4216e5968778a8710e5fc0f4dc7ecdcc53b6448 (patch)
tree5762bde21199c4a6b09c83a30740394e48dc3e20 /Documentation/config/mergetool.txt
parentMerge branch 'pb/pull-fetch-doc' (diff)
parentformat-patch: teach --no-encode-email-headers (diff)
downloadtgif-f4216e5968778a8710e5fc0f4dc7ecdcc53b6448.tar.xz
Merge branch 'eb/format-patch-no-encode-headers'
The output from "git format-patch" uses RFC 2047 encoding for non-ASCII letters on From: and Subject: headers, so that it can directly be fed to e-mail programs. A new option has been added to produce these headers in raw. * eb/format-patch-no-encode-headers: format-patch: teach --no-encode-email-headers
Diffstat (limited to 'Documentation/config/mergetool.txt')
0 files changed, 0 insertions, 0 deletions