diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-05 13:13:05 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-05 13:13:05 -0800 |
| commit | c11c154f429f23f1c30f2aa067ff8bf6c1b982fe (patch) | |
| tree | a602dec0fd795d93525b61c79c77f3152efc0972 /Documentation/config.txt | |
| parent | 518d1c349bda5652a6884127f1d7f5722d557bc8 (diff) | |
| parent | 35840a3e789dd67528caefc146deb698bd6ac7a5 (diff) | |
| download | git-c11c154f429f23f1c30f2aa067ff8bf6c1b982fe.tar.gz git-c11c154f429f23f1c30f2aa067ff8bf6c1b982fe.tar.xz | |
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
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 04e2a7168..b22a7a7ff 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:: @@ -2297,7 +2296,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:: @@ -2337,7 +2336,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:: |