From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 14 Nov 2007 22:04:25 +0000 (-0800)
Subject: Merge branch 'bg/format-patch-N'
X-Git-Tag: v1.5.4-rc0~210
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/55571f7861b81b033b378f3abe145ecbdbc1fdb6?ds=inline;hp=-c

Merge branch 'bg/format-patch-N'

* bg/format-patch-N:
Rearrange git-format-patch synopsis to improve clarity.
format-patch: Test --[no-]numbered and format.numbered
format-patch: Add configuration and off switch for --numbered
---

55571f7861b81b033b378f3abe145ecbdbc1fdb6
diff --combined Documentation/config.txt
index 8d5d200580,268839da73..6dc9f3ed02
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -345,8 -345,8 +345,8 @@@ branch.<name>.mergeoptions:
  	supported.
  
  clean.requireForce::
 -	A boolean to make git-clean do nothing unless given -f or -n.  Defaults
 -	to false.
 +	A boolean to make git-clean do nothing unless given -f
 +	or -n.   Defaults to true.
  
  color.branch::
  	A boolean to enable/disable color in the output of
@@@ -432,6 -432,12 +432,12 @@@ fetch.unpackLimit:
  	pack from a push can make the push operation complete faster,
  	especially on slow filesystems.
  
+ format.numbered::
+ 	A boolean which can enable sequence numbers in patch subjects.
+ 	Seting this option to "auto" will enable it only if there is
+ 	more than one patch.  See --numbered option in
+ 	gitlink:git-format-patch[1].
+ 
  format.headers::
  	Additional email headers to include in a patch to be submitted
  	by mail.  See gitlink:git-format-patch[1].