From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 22 Feb 2015 20:28:31 +0000 (-0800)
Subject: Merge branch 'jc/conf-var-doc'
X-Git-Tag: v2.4.0-rc0~96
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9a9c1f1fdfb4e8bb253bfa27311e8a8ad82c8859;p=git

Merge branch 'jc/conf-var-doc'

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

9a9c1f1fdfb4e8bb253bfa27311e8a8ad82c8859
diff --cc Documentation/config.txt
index ae6791db12,8a76d1dc2a..440784cbdd
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -2341,12 -2269,10 +2340,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::