Merge branch 'js/attach'

* js/attach:
format-patch --attach: not folding some long headers.
format-patch: add --inline option and make --attach a true attachment

diff --cc Documentation/git-format-patch.txt
index 84eabebe0bc767112805d2d35c68ad000d8e1003,dfdb65290fc121087df698826033020c3e8542ed..111d7c60bf1832bbfc27f8b819da77b8761236da
--- 1/Documentation/git-format-patch.txt
--- 2/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@@ -9,8 -9,9 +9,9 @@@ git-format-patch - Prepare patches for 
  SYNOPSIS
  --------
  [verse]
- 'git-format-patch' [<common diff options>] [-n | -k] [-o <dir> | --stdout]
-                  [--attach] [--thread] [-s | --signoff] [--start-number <n>]
+ 'git-format-patch' [-n | -k] [-o <dir> | --stdout] [--thread]
+                  [--attach[=<boundary>] | --inline[=<boundary>]]
 -                 [-s | --signoff] [--diff-options] [--start-number <n>]
++                 [-s | --signoff] [<common diff options>] [--start-number <n>]
                   [--in-reply-to=Message-Id] [--suffix=.<sfx>]
                   [--ignore-if-in-upstream]
                   <since>[..<until>]

diff --cc t/t4013-diff-various.sh
Simple merge