From: Junio C Hamano <junkio@cox.net>
Date: Sun, 11 Mar 2007 07:38:18 +0000 (-0800)
Subject: Merge branch 'js/attach'
X-Git-Tag: v1.5.1-rc1~61
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8a3fbdd9e6c37c74b12fd0e8bd7cde8372861288;p=git.git

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
---

8a3fbdd9e6c37c74b12fd0e8bd7cde8372861288
diff --cc Documentation/git-format-patch.txt
index 84eabebe0,dfdb65290..111d7c60b
--- a/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>]