From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 5 Mar 2015 21:13:05 +0000 (-0800)
Subject: Merge branch 'jc/conf-var-doc' into maint
X-Git-Tag: v2.3.2~15
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c11c154f429f23f1c30f2aa067ff8bf6c1b982fe

Merge branch 'jc/conf-var-doc' into maint

Longstanding configuration variable naming rules has been added to
the documentation.

* jc/conf-var-doc:
CodingGuidelines: describe naming rules for configuration variables
config.txt: mark deprecated variables more prominently
config.txt: clarify that add.ignore-errors is deprecated
---

c11c154f429f23f1c30f2aa067ff8bf6c1b982fe
diff --cc Documentation/config.txt
index 04e2a71687,8a76d1dc2a..b22a7a7ff5
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -2332,12 -2269,10 +2331,12 @@@ sendemail.smtpserverport:
  sendemail.smtpserveroption::
  sendemail.smtpuser::
  sendemail.thread::
 +sendemail.transferencoding::
  sendemail.validate::
 +sendemail.xmailer::
  	See linkgit:git-send-email[1] for description.
  
- sendemail.signedoffcc::
+ sendemail.signedoffcc (deprecated)::
  	Deprecated alias for 'sendemail.signedoffbycc'.
  
  showbranch.default::