diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-02-22 12:28:31 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-02-22 12:28:31 -0800 |
| commit | 9a9c1f1fdfb4e8bb253bfa27311e8a8ad82c8859 (patch) | |
| tree | d46d48f1f8b72f2a7d11683d574acf763caad29b /Documentation/config.txt | |
| parent | 744ea70c7acaa74249ede91d71de9535c1db1431 (diff) | |
| parent | 35840a3e789dd67528caefc146deb698bd6ac7a5 (diff) | |
| download | git-9a9c1f1fdfb4e8bb253bfa27311e8a8ad82c8859.tar.gz git-9a9c1f1fdfb4e8bb253bfa27311e8a8ad82c8859.tar.xz | |
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
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index ae6791db1..440784cbd 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -683,14 +683,13 @@ core.abbrev:: for abbreviated object names to stay unique for sufficiently long time. -add.ignore-errors:: add.ignoreErrors:: +add.ignore-errors (deprecated):: Tells 'git add' to continue adding files when some files cannot be added due to indexing errors. Equivalent to the '--ignore-errors' - option of linkgit:git-add[1]. Older versions of Git accept only - `add.ignore-errors`, which does not follow the usual naming - convention for configuration variables. Newer versions of Git - honor `add.ignoreErrors` as well. + option of linkgit:git-add[1]. `add.ignore-errors` is deprecated, + as it does not follow the usual naming convention for configuration + variables. alias.*:: Command aliases for the linkgit:git[1] command wrapper - e.g. @@ -1960,7 +1959,7 @@ pack.useBitmaps:: true. You should not generally need to turn this off unless you are debugging pack bitmaps. -pack.writebitmaps:: +pack.writebitmaps (deprecated):: This is a deprecated synonym for `repack.writeBitmaps`. pack.writeBitmapHashCache:: @@ -2306,7 +2305,7 @@ sendemail.smtpencryption:: See linkgit:git-send-email[1] for description. Note that this setting is not subject to the 'identity' mechanism. -sendemail.smtpssl:: +sendemail.smtpssl (deprecated):: Deprecated alias for 'sendemail.smtpencryption = ssl'. sendemail.smtpsslcertpath:: @@ -2346,7 +2345,7 @@ sendemail.validate:: sendemail.xmailer:: See linkgit:git-send-email[1] for description. -sendemail.signedoffcc:: +sendemail.signedoffcc (deprecated):: Deprecated alias for 'sendemail.signedoffbycc'. showbranch.default:: |