*config.txt: stick to camelCase naming convention
This should improve readability. Compare "thislongname" and "thisLongName". The following keys are left in unchanged. We can decide what to do with them later. - am.keepcr - core.autocrlf .safecrlf .trustctime - diff.dirstat .noprefix - gitcvs.usecrlfattr - gui.blamehistoryctx .trustmtime - pull.twohead - receive.autogc - sendemail.signedoffbycc .smtpsslcertpath .suppresscc Helped-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Mar 11, 2015 at 16:32 UTC
da0005b8853137c91e44867d899910d5c7eb4425
37 files changed
+212
-212
Documentation/CodingGuidelines
+1
-1
@@ -526,7 +526,7 @@ Writing Documentation:
526
`backticks around word phrases`, do so.
527
`--pretty=oneline`
528
`git rev-list`
529
- `remote.pushdefault`
529
+ `remote.pushDefault`
530
531
Word phrases enclosed in `backtick characters` are rendered literally
532
and will not be further expanded. The use of `backticks` to achieve the
Documentation/blame-options.txt
+1
-1
@@ -4,7 +4,7 @@
4
5
--root::
6
Do not treat root commits as boundaries. This can also be
7
- controlled via the `blame.showroot` config option.
7
+ controlled via the `blame.showRoot` config option.
8
9
--show-stats::
10
Include additional statistics at the end of blame output.
Documentation/config.txt
+121
-121
@@ -225,7 +225,7 @@ See linkgit:git-update-index[1].
225
+
226
The default is true (when core.filemode is not specified in the config file).
227
228
-core.ignorecase::
228
+core.ignoreCase::
229
If true, this option enables various workarounds to enable
230
Git to work better on filesystems that are not case sensitive,
231
like FAT. For example, if a directory listing finds
@@ -234,12 +234,12 @@ core.ignorecase::
234
"Makefile".
235
+
236
The default is false, except linkgit:git-clone[1] or linkgit:git-init[1]
237
-will probe and set core.ignorecase true if appropriate when the repository
237
+will probe and set core.ignoreCase true if appropriate when the repository
238
is created.
239
240
-core.precomposeunicode::
240
+core.precomposeUnicode::
241
This option is only used by Mac OS implementation of Git.
242
- When core.precomposeunicode=true, Git reverts the unicode decomposition
242
+ When core.precomposeUnicode=true, Git reverts the unicode decomposition
243
of filenames done by Mac OS. This is useful when sharing a repository
244
between Mac OS and Linux or Windows.
245
(Git for Windows 1.7.10 or higher is needed, or Git under cygwin 1.7).
@@ -264,13 +264,13 @@ core.trustctime::
264
crawlers and some backup systems).
265
See linkgit:git-update-index[1]. True by default.
266
267
-core.checkstat::
267
+core.checkStat::
268
Determines which stat fields to match between the index
269
and work tree. The user can set this to 'default' or
270
'minimal'. Default (or explicitly 'default'), is to check
271
all fields, including the sub-second part of mtime and ctime.
272
273
-core.quotepath::
273
+core.quotePath::
274
The commands that output paths (e.g. 'ls-files',
275
'diff'), when not given the `-z` option, will quote
276
"unusual" characters in the pathname by enclosing the
@@ -474,9 +474,9 @@ core.compression::
474
-1 is the zlib default. 0 means no compression,
475
and 1..9 are various speed/size tradeoffs, 9 being slowest.
476
If set, this provides a default to other compression variables,
477
- such as 'core.loosecompression' and 'pack.compression'.
477
+ such as 'core.looseCompression' and 'pack.compression'.
478
479
-core.loosecompression::
479
+core.looseCompression::
480
An integer -1..9, indicating the compression level for objects that
481
are not in a pack file. -1 is the zlib default. 0 means no
482
compression, and 1..9 are various speed/size tradeoffs, 9 being
@@ -537,7 +537,7 @@ be delta compressed, but larger binary media files won't be.
537
+
538
Common unit suffixes of 'k', 'm', or 'g' are supported.
539
540
-core.excludesfile::
540
+core.excludesFile::
541
In addition to '.gitignore' (per-directory) and
542
'.git/info/exclude', Git looks into this file for patterns
543
of files which are not meant to be tracked. "`~/`" is expanded
@@ -546,7 +546,7 @@ core.excludesfile::
546
If $XDG_CONFIG_HOME is either not set or empty, $HOME/.config/git/ignore
547
is used instead. See linkgit:gitignore[5].
548
549
-core.askpass::
549
+core.askPass::
550
Some commands (e.g. svn and http interfaces) that interactively
551
ask for a password can be told to use an external program given
552
via the value of this variable. Can be overridden by the 'GIT_ASKPASS'
@@ -555,11 +555,11 @@ core.askpass::
555
prompt. The external program shall be given a suitable prompt as
556
command-line argument and write the password on its STDOUT.
557
558
-core.attributesfile::
558
+core.attributesFile::
559
In addition to '.gitattributes' (per-directory) and
560
'.git/info/attributes', Git looks into this file for attributes
561
(see linkgit:gitattributes[5]). Path expansions are made the same
562
- way as for `core.excludesfile`. Its default value is
562
+ way as for `core.excludesFile`. Its default value is
563
$XDG_CONFIG_HOME/git/attributes. If $XDG_CONFIG_HOME is either not
564
set or empty, $HOME/.config/git/attributes is used instead.
565
@@ -569,7 +569,7 @@ core.editor::
569
variable when it is set, and the environment variable
570
`GIT_EDITOR` is not set. See linkgit:git-var[1].
571
572
-core.commentchar::
572
+core.commentChar::
573
Commands such as `commit` and `tag` that lets you edit
574
messages consider a line that begins with this character
575
commented, and removes them after the editor returns
@@ -638,7 +638,7 @@ core.whitespace::
638
is relevant for `indent-with-non-tab` and when Git fixes `tab-in-indent`
639
errors. The default tab width is 8. Allowed values are 1 to 63.
640
641
-core.fsyncobjectfiles::
641
+core.fsyncObjectFiles::
642
This boolean will enable 'fsync()' when writing object files.
643
+
644
This is a total waste of time and effort on a filesystem that orders
@@ -646,7 +646,7 @@ data writes properly, but can be useful for filesystems that do not use
646
journalling (traditional UNIX filesystems) or that only journal metadata
647
and not file contents (OS X's HFS+, or Linux ext3 with "data=writeback").
648
649
-core.preloadindex::
649
+core.preloadIndex::
650
Enable parallel index preload for operations like 'git diff'
651
+
652
This can speed up operations like 'git diff' and 'git status' especially
@@ -717,7 +717,7 @@ am.keepcr::
717
by giving '--no-keep-cr' from the command line.
718
See linkgit:git-am[1], linkgit:git-mailsplit[1].
719
720
-apply.ignorewhitespace::
720
+apply.ignoreWhitespace::
721
When set to 'change', tells 'git apply' to ignore changes in
722
whitespace, in the same way as the '--ignore-space-change'
723
option.
@@ -729,7 +729,7 @@ apply.whitespace::
729
Tells 'git apply' how to handle whitespaces, in the same way
730
as the '--whitespace' option. See linkgit:git-apply[1].
731
732
-branch.autosetupmerge::
732
+branch.autoSetupMerge::
733
Tells 'git branch' and 'git checkout' to set up new branches
734
so that linkgit:git-pull[1] will appropriately merge from the
735
starting point branch. Note that even if this option is not set,
@@ -741,7 +741,7 @@ branch.autosetupmerge::
741
local branch or remote-tracking
742
branch. This option defaults to true.
743
744
-branch.autosetuprebase::
744
+branch.autoSetupRebase::
745
When a new branch is created with 'git branch' or 'git checkout'
746
that tracks another branch, this variable tells Git to set
747
up pull to rebase instead of merge (see "branch.<name>.rebase").
@@ -752,27 +752,27 @@ branch.autosetuprebase::
752
remote-tracking branches.
753
When `always`, rebase will be set to true for all tracking
754
branches.
755
- See "branch.autosetupmerge" for details on how to set up a
755
+ See "branch.autoSetupMerge" for details on how to set up a
756
branch to track another branch.
757
This option defaults to never.
758
759
branch.<name>.remote::
760
When on branch <name>, it tells 'git fetch' and 'git push'
761
which remote to fetch from/push to. The remote to push to
762
- may be overridden with `remote.pushdefault` (for all branches).
762
+ may be overridden with `remote.pushDefault` (for all branches).
763
The remote to push to, for the current branch, may be further
764
- overridden by `branch.<name>.pushremote`. If no remote is
764
+ overridden by `branch.<name>.pushRemote`. If no remote is
765
configured, or if you are not on any branch, it defaults to
766
- `origin` for fetching and `remote.pushdefault` for pushing.
766
+ `origin` for fetching and `remote.pushDefault` for pushing.
767
Additionally, `.` (a period) is the current local repository
768
(a dot-repository), see `branch.<name>.merge`'s final note below.
769
770
-branch.<name>.pushremote::
770
+branch.<name>.pushRemote::
771
When on branch <name>, it overrides `branch.<name>.remote` for
772
- pushing. It also overrides `remote.pushdefault` for pushing
772
+ pushing. It also overrides `remote.pushDefault` for pushing
773
from branch <name>. When you pull from one place (e.g. your
774
upstream) and push to another place (e.g. your own publishing
775
- repository), you would want to set `remote.pushdefault` to
775
+ repository), you would want to set `remote.pushDefault` to
776
specify the remote to push to for all branches, and use this
777
option to override it for a specific branch.
778
@@ -794,7 +794,7 @@ branch.<name>.merge::
794
branch.<name>.merge to the desired branch, and use the relative path
795
setting `.` (a period) for branch.<name>.remote.
796
797
-branch.<name>.mergeoptions::
797
+branch.<name>.mergeOptions::
798
Sets default options for merging into branch <name>. The syntax and
799
supported options are the same as those of linkgit:git-merge[1], but
800
option values containing whitespace characters are currently not
@@ -938,7 +938,7 @@ color.pager::
938
A boolean to enable/disable colored output when the pager is in
939
use (default is true).
940
941
-color.showbranch::
941
+color.showBranch::
942
A boolean to enable/disable color in the output of
943
linkgit:git-show-branch[1]. May be set to `always`,
944
`false` (or `never`) or `auto` (or `true`), in which case colors are used
@@ -1038,7 +1038,7 @@ commit.cleanup::
1038
have to remove the help lines that begin with `#` in the commit log
1039
template yourself, if you do this).
1040
1041
-commit.gpgsign::
1041
+commit.gpgSign::
1042
1043
A boolean to specify whether all commits should be GPG signed.
1044
Use of this option when doing operations such as rebase can
@@ -1151,7 +1151,7 @@ format.cc::
1151
by mail. See the --to and --cc options in
1152
linkgit:git-format-patch[1].
1153
1154
-format.subjectprefix::
1154
+format.subjectPrefix::
1155
The default for format-patch is to output files with the '[PATCH]'
1156
subject prefix. Use this variable to change that prefix.
1157
@@ -1161,7 +1161,7 @@ format.signature::
1161
Set this variable to the empty string ("") to suppress
1162
signature generation.
1163
1164
-format.signaturefile::
1164
+format.signatureFile::
1165
Works just like format.signature except the contents of the
1166
file specified by this variable will be used as the signature.
1167
@@ -1185,7 +1185,7 @@ format.thread::
1185
A true boolean value is the same as `shallow`, and a false
1186
value disables threading.
1187
1188
-format.signoff::
1188
+format.signOff::
1189
A boolean value which lets you enable the `-s/--signoff` option of
1190
format-patch by default. *Note:* Adding the Signed-off-by: line to a
1191
patch should be a conscious act and means that you certify you have
@@ -1224,17 +1224,17 @@ gc.auto::
1224
light-weight garbage collection from time to time. The
1225
default value is 6700. Setting this to 0 disables it.
1226
1227
-gc.autopacklimit::
1227
+gc.autoPackLimit::
1228
When there are more than this many packs that are not
1229
marked with `*.keep` file in the repository, `git gc
1230
--auto` consolidates them into one larger pack. The
1231
default value is 50. Setting this to 0 disables it.
1232
1233
-gc.autodetach::
1233
+gc.autoDetach::
1234
Make `git gc --auto` return immediately and run in background
1235
if the system supports it. Default is true.
1236
1237
-gc.packrefs::
1237
+gc.packRefs::
1238
Running `git pack-refs` in a repository renders it
1239
unclonable by Git versions prior to 1.5.1.2 over dumb
1240
transports such as HTTP. This variable determines whether
@@ -1242,38 +1242,38 @@ gc.packrefs::
1242
to enable it within all non-bare repos or it can be set to a
1243
boolean value. The default is `true`.
1244
1245
-gc.pruneexpire::
1245
+gc.pruneExpire::
1246
When 'git gc' is run, it will call 'prune --expire 2.weeks.ago'.
1247
Override the grace period with this config variable. The value
1248
"now" may be used to disable this grace period and always prune
1249
unreachable objects immediately.
1250
1251
-gc.reflogexpire::
1252
-gc.<pattern>.reflogexpire::
1251
+gc.reflogExpire::
1252
+gc.<pattern>.reflogExpire::
1253
'git reflog expire' removes reflog entries older than
1254
this time; defaults to 90 days. With "<pattern>" (e.g.
1255
"refs/stash") in the middle the setting applies only to
1256
the refs that match the <pattern>.
1257
1258
-gc.reflogexpireunreachable::
1259
-gc.<ref>.reflogexpireunreachable::
1258
+gc.reflogExpireUnreachable::
1259
+gc.<ref>.reflogExpireUnreachable::
1260
'git reflog expire' removes reflog entries older than
1261
this time and are not reachable from the current tip;
1262
defaults to 30 days. With "<pattern>" (e.g. "refs/stash")
1263
in the middle, the setting applies only to the refs that
1264
match the <pattern>.
1265
1266
-gc.rerereresolved::
1266
+gc.rerereResolved::
1267
Records of conflicted merge you resolved earlier are
1268
kept for this many days when 'git rerere gc' is run.
1269
The default is 60 days. See linkgit:git-rerere[1].
1270
1271
-gc.rerereunresolved::
1271
+gc.rerereUnresolved::
1272
Records of conflicted merge you have not resolved are
1273
kept for this many days when 'git rerere gc' is run.
1274
The default is 15 days. See linkgit:git-rerere[1].
1275
1276
-gitcvs.commitmsgannotation::
1276
+gitcvs.commitMsgAnnotation::
1277
Append this string to each commit message. Set to empty string
1278
to disable this feature. Defaults to "via git-CVS emulator".
1279
@@ -1281,7 +1281,7 @@ gitcvs.enabled::
1281
Whether the CVS server interface is enabled for this repository.
1282
See linkgit:git-cvsserver[1].
1283
1284
-gitcvs.logfile::
1284
+gitcvs.logFile::
1285
Path to a log file where the CVS server interface well... logs
1286
various stuff. See linkgit:git-cvsserver[1].
1287
@@ -1293,10 +1293,10 @@ gitcvs.usecrlfattr::
1293
treat it as text. If they suppress text conversion, the file
1294
will be set with '-kb' mode, which suppresses any newline munging
1295
the client might otherwise do. If the attributes do not allow
1296
- the file type to be determined, then 'gitcvs.allbinary' is
1296
+ the file type to be determined, then 'gitcvs.allBinary' is
1297
used. See linkgit:gitattributes[5].
1298
1299
-gitcvs.allbinary::
1299
+gitcvs.allBinary::
1300
This is used if 'gitcvs.usecrlfattr' does not resolve
1301
the correct '-kb' mode to use. If true, all
1302
unresolved files are sent to the client in
@@ -1306,7 +1306,7 @@ gitcvs.allbinary::
1306
then the contents of the file are examined to decide if
1307
it is binary, similar to 'core.autocrlf'.
1308
1309
-gitcvs.dbname::
1309
+gitcvs.dbName::
1310
Database used by git-cvsserver to cache revision information
1311
derived from the Git repository. The exact meaning depends on the
1312
used database driver, for SQLite (which is the default driver) this
@@ -1314,7 +1314,7 @@ gitcvs.dbname::
1314
linkgit:git-cvsserver[1] for details). May not contain semicolons (`;`).
1315
Default: '%Ggitcvs.%m.sqlite'
1316
1317
-gitcvs.dbdriver::
1317
+gitcvs.dbDriver::
1318
Used Perl DBI driver. You can specify any available driver
1319
for this here, but it might not work. git-cvsserver is tested
1320
with 'DBD::SQLite', reported to work with 'DBD::Pg', and
@@ -1322,10 +1322,10 @@ gitcvs.dbdriver::
1322
May not contain double colons (`:`). Default: 'SQLite'.
1323
See linkgit:git-cvsserver[1].
1324
1325
-gitcvs.dbuser, gitcvs.dbpass::
1326
- Database user and password. Only useful if setting 'gitcvs.dbdriver',
1325
+gitcvs.dbUser, gitcvs.dbPass::
1326
+ Database user and password. Only useful if setting 'gitcvs.dbDriver',
1327
since SQLite has no concept of database users and/or passwords.
1328
- 'gitcvs.dbuser' supports variable substitution (see
1328
+ 'gitcvs.dbUser' supports variable substitution (see
1329
linkgit:git-cvsserver[1] for details).
1330
1331
gitcvs.dbTableNamePrefix::
@@ -1336,7 +1336,7 @@ gitcvs.dbTableNamePrefix::
1336
characters will be replaced with underscores.
1337
1338
All gitcvs variables except for 'gitcvs.usecrlfattr' and
1339
-'gitcvs.allbinary' can also be specified as
1339
+'gitcvs.allBinary' can also be specified as
1340
'gitcvs.<access_method>.<varname>' (where 'access_method'
1341
is one of "ext" and "pserver") to make them apply only for the given
1342
access method.
@@ -1354,7 +1354,7 @@ gitweb.highlight::
1354
gitweb.patches::
1355
gitweb.pickaxe::
1356
gitweb.remote_heads::
1357
-gitweb.showsizes::
1357
+gitweb.showSizes::
1358
gitweb.snapshot::
1359
See linkgit:gitweb.conf[5] for description.
1360
@@ -1383,15 +1383,15 @@ gpg.program::
1383
signed, and the program is expected to send the result to its
1384
standard output.
1385
1386
-gui.commitmsgwidth::
1386
+gui.commitMsgWidth::
1387
Defines how wide the commit message window is in the
1388
linkgit:git-gui[1]. "75" is the default.
1389
1390
-gui.diffcontext::
1390
+gui.diffContext::
1391
Specifies how many context lines should be used in calls to diff
1392
made by the linkgit:git-gui[1]. The default is "5".
1393
1394
-gui.displayuntracked::
1394
+gui.displayUntracked::
1395
Determines if linkgit::git-gui[1] shows untracked files
1396
in the file list. The default is "true".
1397
@@ -1403,16 +1403,16 @@ gui.encoding::
1403
If this option is not set, the tools default to the
1404
locale encoding.
1405
1406
-gui.matchtrackingbranch::
1406
+gui.matchTrackingBranch::
1407
Determines if new branches created with linkgit:git-gui[1] should
1408
default to tracking remote branches with matching names or
1409
not. Default: "false".
1410
1411
-gui.newbranchtemplate::
1411
+gui.newBranchTemplate::
1412
Is used as suggested name when creating new branches using the
1413
linkgit:git-gui[1].
1414
1415
-gui.pruneduringfetch::
1415
+gui.pruneDuringFetch::
1416
"true" if linkgit:git-gui[1] should prune remote-tracking branches when
1417
performing a fetch. The default value is "false".
1418
@@ -1420,17 +1420,17 @@ gui.trustmtime::
1420
Determines if linkgit:git-gui[1] should trust the file modification
1421
timestamp or not. By default the timestamps are not trusted.
1422
1423
-gui.spellingdictionary::
1423
+gui.spellingDictionary::
1424
Specifies the dictionary used for spell checking commit messages in
1425
the linkgit:git-gui[1]. When set to "none" spell checking is turned
1426
off.
1427
1428
-gui.fastcopyblame::
1428
+gui.fastCopyBlame::
1429
If true, 'git gui blame' uses `-C` instead of `-C -C` for original
1430
location detection. It makes blame significantly faster on huge
1431
repositories at the expense of less thorough copy detection.
1432
1433
-gui.copyblamethreshold::
1433
+gui.copyBlameThreshold::
1434
Specifies the threshold to use in 'git gui blame' original location
1435
detection, measured in alphanumeric characters. See the
1436
linkgit:git-blame[1] manual for more information on copy detection.
@@ -1450,22 +1450,22 @@ guitool.<name>.cmd::
1450
'FILENAME', and the name of the current branch as 'CUR_BRANCH' (if
1451
the head is detached, 'CUR_BRANCH' is empty).
1452
1453
-guitool.<name>.needsfile::
1453
+guitool.<name>.needsFile::
1454
Run the tool only if a diff is selected in the GUI. It guarantees
1455
that 'FILENAME' is not empty.
1456
1457
-guitool.<name>.noconsole::
1457
+guitool.<name>.noConsole::
1458
Run the command silently, without creating a window to display its
1459
output.
1460
1461
-guitool.<name>.norescan::
1461
+guitool.<name>.noRescan::
1462
Don't rescan the working directory for changes after the tool
1463
finishes execution.
1464
1465
guitool.<name>.confirm::
1466
Show a confirmation dialog before actually running the tool.
1467
1468
-guitool.<name>.argprompt::
1468
+guitool.<name>.argPrompt::
1469
Request a string argument from the user, and pass it to the tool
1470
through the 'ARGS' environment variable. Since requesting an
1471
argument implies confirmation, the 'confirm' option has no effect
@@ -1473,13 +1473,13 @@ guitool.<name>.argprompt::
1473
the dialog uses a built-in generic prompt; otherwise the exact
1474
value of the variable is used.
1475
1476
-guitool.<name>.revprompt::
1476
+guitool.<name>.revPrompt::
1477
Request a single valid revision from the user, and set the
1478
'REVISION' environment variable. In other aspects this option
1479
- is similar to 'argprompt', and can be used together with it.
1479
+ is similar to 'argPrompt', and can be used together with it.
1480
1481
-guitool.<name>.revunmerged::
1482
- Show only unmerged branches in the 'revprompt' subdialog.
1481
+guitool.<name>.revUnmerged::
1482
+ Show only unmerged branches in the 'revPrompt' subdialog.
1483
This is useful for tools similar to merge or rebase, but not
1484
for things like checkout or reset.
1485
@@ -1489,7 +1489,7 @@ guitool.<name>.title::
1489
1490
guitool.<name>.prompt::
1491
Specifies the general prompt string to display at the top of
1492
- the dialog, before subsections for 'argprompt' and 'revprompt'.
1492
+ the dialog, before subsections for 'argPrompt' and 'revPrompt'.
1493
The default value includes the actual command.
1494
1495
help.browser::
@@ -1501,7 +1501,7 @@ help.format::
1501
Values 'man', 'info', 'web' and 'html' are supported. 'man' is
1502
the default. 'web' and 'html' are the same.
1503
1504
-help.autocorrect::
1504
+help.autoCorrect::
1505
Automatically correct and execute mistyped commands after
1506
waiting for the given number of deciseconds (0.1 sec). If more
1507
than one command can be deduced from the entered text, nothing
@@ -1510,7 +1510,7 @@ help.autocorrect::
1510
value is 0 - the command will be just shown but not executed.
1511
This is the default.
1512
1513
-help.htmlpath::
1513
+help.htmlPath::
1514
Specify the path where the HTML documentation resides. File system paths
1515
and URLs are supported. HTML pages will be prefixed with this path when
1516
help is displayed in the 'web' format. This defaults to the documentation
@@ -1522,17 +1522,17 @@ http.proxy::
1522
`curl(1)`). This can be overridden on a per-remote basis; see
1523
remote.<name>.proxy
1524
1525
-http.cookiefile::
1525
+http.cookieFile::
1526
File containing previously stored cookie lines which should be used
1527
in the Git http session, if they match the server. The file format
1528
of the file to read cookies from should be plain HTTP headers or
1529
the Netscape/Mozilla cookie file format (see linkgit:curl[1]).
1530
- NOTE that the file specified with http.cookiefile is only used as
1530
+ NOTE that the file specified with http.cookieFile is only used as
1531
input unless http.saveCookies is set.
1532
1533
-http.savecookies::
1533
+http.saveCookies::
1534
If set, store cookies received during requests to the file specified by
1535
- http.cookiefile. Has no effect if http.cookiefile is unset.
1535
+ http.cookieFile. Has no effect if http.cookieFile is unset.
1536
1537
http.sslVerify::
1538
Whether to verify the SSL certificate when fetching or pushing
@@ -1603,7 +1603,7 @@ http.noEPSV::
1603
support EPSV mode. Can be overridden by the 'GIT_CURL_FTP_NO_EPSV'
1604
environment variable. Default is false (curl will use EPSV).
1605
1606
-http.useragent::
1606
+http.userAgent::
1607
The HTTP USER_AGENT string presented to an HTTP server. The default
1608
value represents the version of the client Git such as git/1.7.1.
1609
This option allows you to override this value to a more common value
@@ -1676,7 +1676,7 @@ index.version::
1676
Specify the version with which new index files should be
1677
initialized. This does not affect existing repositories.
1678
1679
-init.templatedir::
1679
+init.templateDir::
1680
Specify the directory from which templates will be copied.
1681
(See the "TEMPLATE DIRECTORY" section of linkgit:git-init[1].)
1682
@@ -1692,7 +1692,7 @@ instaweb.local::
1692
If true the web server started by linkgit:git-instaweb[1] will
1693
be bound to the local IP (127.0.0.1).
1694
1695
-instaweb.modulepath::
1695
+instaweb.modulePath::
1696
The default module path for linkgit:git-instaweb[1] to use
1697
instead of /usr/lib/apache2/modules. Only used if httpd
1698
is Apache.
@@ -1701,7 +1701,7 @@ instaweb.port::
1701
The port number to bind the gitweb httpd to. See
1702
linkgit:git-instaweb[1].
1703
1704
-interactive.singlekey::
1704
+interactive.singleKey::
1705
In interactive commands, allow the user to provide one-letter
1706
input with a single key (i.e., without hitting enter).
1707
Currently this is used by the `--patch` mode of
@@ -1729,7 +1729,7 @@ log.decorate::
1729
specified, the full ref name (including prefix) will be printed.
1730
This is the same as the log commands '--decorate' option.
1731
1732
-log.showroot::
1732
+log.showRoot::
1733
If true, the initial commit will be shown as a big creation event.
1734
This is equivalent to a diff against an empty tree.
1735
Tools like linkgit:git-log[1] or linkgit:git-whatchanged[1], which
@@ -1966,7 +1966,7 @@ pack.useBitmaps::
1966
true. You should not generally need to turn this off unless
1967
you are debugging pack bitmaps.
1968
1969
-pack.writebitmaps (deprecated)::
1969
+pack.writeBitmaps (deprecated)::
1970
This is a deprecated synonym for `repack.writeBitmaps`.
1971
1972
pack.writeBitmapHashCache::
@@ -2089,10 +2089,10 @@ rebase.stat::
2089
Whether to show a diffstat of what changed upstream since the last
2090
rebase. False by default.
2091
2092
-rebase.autosquash::
2092
+rebase.autoSquash::
2093
If set to true enable '--autosquash' option by default.
2094
2095
-rebase.autostash::
2095
+rebase.autoStash::
2096
When set to true, automatically create a temporary stash
2097
before the operation begins, and apply it after the operation
2098
ends. This means that you can run rebase on a dirty worktree.
@@ -2100,7 +2100,7 @@ rebase.autostash::
2100
successful rebase might result in non-trivial conflicts.
2101
Defaults to false.
2102
2103
-receive.advertiseatomic::
2103
+receive.advertiseAtomic::
2104
By default, git-receive-pack will advertise the atomic push
2105
capability to its clients. If you don't want to this capability
2106
to be advertised, set this variable to false.
@@ -2110,13 +2110,13 @@ receive.autogc::
2110
receiving data from git-push and updating refs. You can stop
2111
it by setting this variable to false.
2112
2113
-receive.certnonceseed::
2113
+receive.certNonceSeed::
2114
By setting this variable to a string, `git receive-pack`
2115
will accept a `git push --signed` and verifies it by using
2116
a "nonce" protected by HMAC using this string as a secret
2117
key.
2118
2119
-receive.certnonceslop::
2119
+receive.certNonceSlop::
2120
When a `git push --signed` sent a push certificate with a
2121
"nonce" that was issued by a receive-pack serving the same
2122
repository within this many seconds, export the "nonce"
@@ -2180,7 +2180,7 @@ receive.denyNonFastForwards::
2180
even if that push is forced. This configuration variable is
2181
set when initializing a shared repository.
2182
2183
-receive.hiderefs::
2183
+receive.hideRefs::
2184
String(s) `receive-pack` uses to decide which refs to omit
2185
from its initial advertisement. Use more than one
2186
definitions to specify multiple prefix strings. A ref that
@@ -2189,18 +2189,18 @@ receive.hiderefs::
2189
push`, and an attempt to update or delete a hidden ref by
2190
`git push` is rejected.
2191
2192
-receive.updateserverinfo::
2192
+receive.updateServerInfo::
2193
If set to true, git-receive-pack will run git-update-server-info
2194
after receiving data from git-push and updating refs.
2195
2196
-receive.shallowupdate::
2196
+receive.shallowUpdate::
2197
If set to true, .git/shallow can be updated when new refs
2198
require new shallow roots. Otherwise those refs are rejected.
2199
2200
-remote.pushdefault::
2200
+remote.pushDefault::
2201
The remote to push to by default. Overrides
2202
`branch.<name>.remote` for all branches, and is overridden by
2203
- `branch.<name>.pushremote` for specific branches.
2203
+ `branch.<name>.pushRemote` for specific branches.
2204
2205
remote.<name>.url::
2206
The URL of a remote repository. See linkgit:git-fetch[1] or
@@ -2244,7 +2244,7 @@ remote.<name>.uploadpack::
2244
The default program to execute on the remote side when fetching. See
2245
option \--upload-pack of linkgit:git-fetch-pack[1].
2246
2247
-remote.<name>.tagopt::
2247
+remote.<name>.tagOpt::
2248
Setting this value to \--no-tags disables automatic tag following when
2249
fetching from remote <name>. Setting it to \--tags will fetch every
2250
tag from remote <name>, even if they are not reachable from remote
@@ -2266,7 +2266,7 @@ remotes.<group>::
2266
The list of remotes which are fetched by "git remote update
2267
<group>". See linkgit:git-remote[1].
2268
2269
-repack.usedeltabaseoffset::
2269
+repack.useDeltaBaseOffset::
2270
By default, linkgit:git-repack[1] creates packs that use
2271
delta-base offset. If you need to share your repository with
2272
Git older than version 1.4.4, either directly or via a dumb
@@ -2289,7 +2289,7 @@ repack.writeBitmaps::
2289
space and extra time spent on the initial repack. Defaults to
2290
false.
2291
2292
-rerere.autoupdate::
2292
+rerere.autoUpdate::
2293
When set to true, `git-rerere` updates the index with the
2294
resulting contents after it cleanly resolves conflicts using
2295
previously recorded resolution. Defaults to false.
@@ -2308,12 +2308,12 @@ sendemail.identity::
2308
values in the 'sendemail' section. The default identity is
2309
the value of 'sendemail.identity'.
2310
2311
-sendemail.smtpencryption::
2311
+sendemail.smtpEncryption::
2312
See linkgit:git-send-email[1] for description. Note that this
2313
setting is not subject to the 'identity' mechanism.
2314
2315
sendemail.smtpssl (deprecated)::
2316
- Deprecated alias for 'sendemail.smtpencryption = ssl'.
2316
+ Deprecated alias for 'sendemail.smtpEncryption = ssl'.
2317
2318
sendemail.smtpsslcertpath::
2319
Path to ca-certificates (either a directory or a single file).
@@ -2325,29 +2325,29 @@ sendemail.<identity>.*::
2325
identity is selected, through command-line or
2326
'sendemail.identity'.
2327
2328
-sendemail.aliasesfile::
2329
-sendemail.aliasfiletype::
2328
+sendemail.aliasesFile::
2329
+sendemail.aliasFileType::
2330
sendemail.annotate::
2331
sendemail.bcc::
2332
sendemail.cc::
2333
-sendemail.cccmd::
2334
-sendemail.chainreplyto::
2333
+sendemail.ccCmd::
2334
+sendemail.chainReplyTo::
2335
sendemail.confirm::
2336
-sendemail.envelopesender::
2336
+sendemail.envelopeSender::
2337
sendemail.from::
2338
-sendemail.multiedit::
2338
+sendemail.multiEdit::
2339
sendemail.signedoffbycc::
2340
-sendemail.smtppass::
2340
+sendemail.smtpPass::
2341
sendemail.suppresscc::
2342
-sendemail.suppressfrom::
2342
+sendemail.suppressFrom::
2343
sendemail.to::
2344
-sendemail.smtpdomain::
2345
-sendemail.smtpserver::
2346
-sendemail.smtpserverport::
2347
-sendemail.smtpserveroption::
2348
-sendemail.smtpuser::
2344
+sendemail.smtpDomain::
2345
+sendemail.smtpServer::
2346
+sendemail.smtpServerPort::
2347
+sendemail.smtpServerOption::
2348
+sendemail.smtpUser::
2349
sendemail.thread::
2350
-sendemail.transferencoding::
2350
+sendemail.transferEncoding::
2351
sendemail.validate::
2352
sendemail.xmailer::
2353
See linkgit:git-send-email[1] for description.
@@ -2399,7 +2399,7 @@ If this variable is not specified, it defaults to 'normal'.
2399
This variable can be overridden with the -u|--untracked-files option
2400
of linkgit:git-status[1] and linkgit:git-commit[1].
2401
2402
-status.submodulesummary::
2402
+status.submoduleSummary::
2403
Defaults to false.
2404
If this is set to a non zero number or true (identical to -1 or an
2405
unlimited number), the submodule summary will be enabled and a
@@ -2474,9 +2474,9 @@ transfer.fsckObjects::
2474
not set, the value of this variable is used instead.
2475
Defaults to false.
2476
2477
-transfer.hiderefs::
2478
- This variable can be used to set both `receive.hiderefs`
2479
- and `uploadpack.hiderefs` at the same time to the same
2477
+transfer.hideRefs::
2478
+ This variable can be used to set both `receive.hideRefs`
2479
+ and `uploadpack.hideRefs` at the same time to the same
2480
values. See entries for these other variables.
2481
2482
transfer.unpackLimit::
@@ -2491,7 +2491,7 @@ uploadarchive.allowUnreachable::
2491
linkgit:git-upload-archive[1] for more details. Defaults to
2492
`false`.
2493
2494
-uploadpack.hiderefs::
2494
+uploadpack.hideRefs::
2495
String(s) `upload-pack` uses to decide which refs to omit
2496
from its initial advertisement. Use more than one
2497
definitions to specify multiple prefix strings. A ref that
@@ -2501,12 +2501,12 @@ uploadpack.hiderefs::
2501
fetch` will fail. See also `uploadpack.allowtipsha1inwant`.
2502
2503
uploadpack.allowtipsha1inwant::
2504
- When `uploadpack.hiderefs` is in effect, allow `upload-pack`
2504
+ When `uploadpack.hideRefs` is in effect, allow `upload-pack`
2505
to accept a fetch request that asks for an object at the tip
2506
of a hidden ref (by default, such a request is rejected).
2507
- see also `uploadpack.hiderefs`.
2507
+ see also `uploadpack.hideRefs`.
2508
2509
-uploadpack.keepalive::
2509
+uploadpack.keepAlive::
2510
When `upload-pack` has started `pack-objects`, there may be a
2511
quiet period while `pack-objects` prepares the pack. Normally
2512
it would output progress information, but if `--quiet` was used
@@ -2514,7 +2514,7 @@ uploadpack.keepalive::
2514
the pack data begins. Some clients and networks may consider
2515
the server to be hung and give up. Setting this option instructs
2516
`upload-pack` to send an empty keepalive packet every
2517
- `uploadpack.keepalive` seconds. Setting this option to 0
2517
+ `uploadpack.keepAlive` seconds. Setting this option to 0
2518
disables keepalive packets entirely. The default is 5 seconds.
2519
2520
url.<base>.insteadOf::
@@ -2551,7 +2551,7 @@ user.name::
2551
Can be overridden by the 'GIT_AUTHOR_NAME' and 'GIT_COMMITTER_NAME'
2552
environment variables. See linkgit:git-commit-tree[1].
2553
2554
-user.signingkey::
2554
+user.signingKey::
2555
If linkgit:git-tag[1] or linkgit:git-commit[1] is not selecting the
2556
key you want it to automatically when creating a signed tag or
2557
commit, you can override the default selection with this variable.
Documentation/diff-config.txt
+5
-5
@@ -1,4 +1,4 @@
1
-diff.autorefreshindex::
1
+diff.autoRefreshIndex::
2
When using 'git diff' to compare with work tree
3
files, do not consider stat-only change as changed.
4
Instead, silently run `git update-index --refresh` to
@@ -75,11 +75,11 @@ diff.ignoreSubmodules::
75
commands such as 'git diff-files'. 'git checkout' also honors
76
this setting when reporting uncommitted changes. Setting it to
77
'all' disables the submodule summary normally shown by 'git commit'
78
- and 'git status' when 'status.submodulesummary' is set unless it is
78
+ and 'git status' when 'status.submoduleSummary' is set unless it is
79
overridden by using the --ignore-submodules command-line option.
80
The 'git submodule' commands are not affected by this setting.
81
82
-diff.mnemonicprefix::
82
+diff.mnemonicPrefix::
83
If set, 'git diff' uses a prefix pair that is different from the
84
standard "a/" and "b/" depending on what is being compared. When
85
this configuration is in effect, reverse diff output also swaps
@@ -98,7 +98,7 @@ diff.mnemonicprefix::
98
diff.noprefix::
99
If set, 'git diff' does not show any source or destination prefix.
100
101
-diff.orderfile::
101
+diff.orderFile::
102
File indicating how to order files within a diff, using
103
one shell glob pattern per line.
104
Can be overridden by the '-O' option to linkgit:git-diff[1].
@@ -148,7 +148,7 @@ diff.<driver>.textconv::
148
conversion is used to generate a human-readable diff. See
149
linkgit:gitattributes[5] for details.
150
151
-diff.<driver>.wordregex::
151
+diff.<driver>.wordRegex::
152
The regular expression that the diff driver should use to
153
split words in a line. See linkgit:gitattributes[5] for
154
details.
Documentation/diff-options.txt
+2
-2
@@ -432,8 +432,8 @@ endif::git-format-patch[]
432
-O<orderfile>::
433
Output the patch in the order specified in the
434
<orderfile>, which has one shell glob pattern per line.
435
- This overrides the `diff.orderfile` configuration variable
436
- (see linkgit:git-config[1]). To cancel `diff.orderfile`,
435
+ This overrides the `diff.orderFile` configuration variable
436
+ (see linkgit:git-config[1]). To cancel `diff.orderFile`,
437
use `-O/dev/null`.
438
439
ifndef::git-format-patch[]
Documentation/fetch-options.txt
+1
-1
@@ -68,7 +68,7 @@ endif::git-pull[]
68
By default, tags that point at objects that are downloaded
69
from the remote repository are fetched and stored locally.
70
This option disables this automatic tag following. The default
71
- behavior for a remote may be specified with the remote.<name>.tagopt
71
+ behavior for a remote may be specified with the remote.<name>.tagOpt
72
setting. See linkgit:git-config[1].
73
74
ifndef::git-pull[]
Documentation/git-add.txt
+2
-2
@@ -173,7 +173,7 @@ for "git add --no-all <pathspec>...", i.e. ignored removed files.
173
Configuration
174
-------------
175
176
-The optional configuration variable `core.excludesfile` indicates a path to a
176
+The optional configuration variable `core.excludesFile` indicates a path to a
177
file containing patterns of file names to exclude from git-add, similar to
178
$GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to
179
those in info/exclude. See linkgit:gitignore[5].
@@ -317,7 +317,7 @@ After deciding the fate for all hunks, if there is any hunk
317
that was chosen, the index is updated with the selected hunks.
318
+
319
You can omit having to type return here, by setting the configuration
320
-variable `interactive.singlekey` to `true`.
320
+variable `interactive.singleKey` to `true`.
321
322
diff::
323
Documentation/git-apply.txt
+1
-1
@@ -242,7 +242,7 @@ has no effect when `--index` or `--cached` is in use.
242
Configuration
243
-------------
244
245
-apply.ignorewhitespace::
245
+apply.ignoreWhitespace::
246
Set to 'change' if you want changes in whitespace to be ignored by default.
247
Set to one of: no, none, never, false if you want changes in
248
whitespace to be significant.
Documentation/git-branch.txt
+3
-3
@@ -51,7 +51,7 @@ When a local branch is started off a remote-tracking branch, Git sets up the
51
branch (specifically the `branch.<name>.remote` and `branch.<name>.merge`
52
configuration entries) so that 'git pull' will appropriately merge from
53
the remote-tracking branch. This behavior may be changed via the global
54
-`branch.autosetupmerge` configuration flag. That setting can be
54
+`branch.autoSetupMerge` configuration flag. That setting can be
55
overridden by using the `--track` and `--no-track` options, and
56
changed later using `git branch --set-upstream-to`.
57
@@ -166,14 +166,14 @@ This option is only applicable in non-verbose mode.
166
upstream when the new branch is checked out.
167
+
168
This behavior is the default when the start point is a remote-tracking branch.
169
-Set the branch.autosetupmerge configuration variable to `false` if you
169
+Set the branch.autoSetupMerge configuration variable to `false` if you
170
want `git checkout` and `git branch` to always behave as if '--no-track'
171
were given. Set it to `always` if you want this behavior when the
172
start-point is either a local or remote-tracking branch.
173
174
--no-track::
175
Do not set up "upstream" configuration, even if the
176
- branch.autosetupmerge configuration variable is true.
176
+ branch.autoSetupMerge configuration variable is true.
177
178
--set-upstream::
179
If specified branch does not exist yet or if `--force` has been
Documentation/git-check-ignore.txt
+1
-1
@@ -72,7 +72,7 @@ matching pattern, <source> is the pattern's source file, and <linenum>
72
is the line number of the pattern within that source. If the pattern
73
contained a `!` prefix or `/` suffix, it will be preserved in the
74
output. <source> will be an absolute path when referring to the file
75
-configured by `core.excludesfile`, or relative to the repository root
75
+configured by `core.excludesFile`, or relative to the repository root
76
when referring to `.git/info/exclude` or a per-directory exclude file.
77
78
If `-z` is specified, the pathnames in the output are delimited by the
Documentation/git-checkout.txt
+2
-2
@@ -144,7 +144,7 @@ explicitly give a name with '-b' in such a case.
144
145
--no-track::
146
Do not set up "upstream" configuration, even if the
147
- branch.autosetupmerge configuration variable is true.
147
+ branch.autoSetupMerge configuration variable is true.
148
149
-l::
150
Create the new branch's reflog; see linkgit:git-branch[1] for
@@ -210,7 +210,7 @@ the conflicted merge in the specified paths.
210
--conflict=<style>::
211
The same as --merge option above, but changes the way the
212
conflicting hunks are presented, overriding the
213
- merge.conflictstyle configuration variable. Possible values are
213
+ merge.conflictStyle configuration variable. Possible values are
214
"merge" (default) and "diff3" (in addition to what is shown by
215
"merge" style, shows the original contents).
216
Documentation/git-commit-tree.txt
+1
-1
@@ -59,7 +59,7 @@ OPTIONS
59
GPG-sign commit.
60
61
--no-gpg-sign::
62
- Countermand `commit.gpgsign` configuration variable that is
62
+ Countermand `commit.gpgSign` configuration variable that is
63
set to force each and every commit to be signed.
64
65
Documentation/git-commit.txt
+1
-1
@@ -310,7 +310,7 @@ configuration variable documented in linkgit:git-config[1].
310
GPG-sign commit.
311
312
--no-gpg-sign::
313
- Countermand `commit.gpgsign` configuration variable that is
313
+ Countermand `commit.gpgSign` configuration variable that is
314
set to force each and every commit to be signed.
315
316
\--::
Documentation/git-config.txt
+1
-1
@@ -405,7 +405,7 @@ true
405
% git config --bool --get-urlmatch http.sslverify https://weak.example.com
406
false
407
% git config --get-urlmatch http https://weak.example.com
408
-http.cookiefile /tmp/cookie.txt
408
+http.cookieFile /tmp/cookie.txt
409
http.sslverify false
410
------------
411
Documentation/git-cvsserver.txt
+11
-11
@@ -154,7 +154,7 @@ with CVS_SERVER (and shouldn't) as 'git-shell' understands `cvs` to mean
154
[gitcvs]
155
enabled=1
156
# optional for debugging
157
- logfile=/path/to/logfile
157
+ logFile=/path/to/logfile
158
159
------
160
Note: you need to ensure each user that is going to invoke 'git-cvsserver' has
@@ -254,14 +254,14 @@ Configuring database backend
254
its documentation if changing these variables, especially
255
about `DBI->connect()`.
256
257
-gitcvs.dbname::
257
+gitcvs.dbName::
258
Database name. The exact meaning depends on the
259
selected database driver, for SQLite this is a filename.
260
Supports variable substitution (see below). May
261
not contain semicolons (`;`).
262
Default: '%Ggitcvs.%m.sqlite'
263
264
-gitcvs.dbdriver::
264
+gitcvs.dbDriver::
265
Used DBI driver. You can specify any available driver
266
for this here, but it might not work. cvsserver is tested
267
with 'DBD::SQLite', reported to work with
@@ -271,12 +271,12 @@ gitcvs.dbdriver::
271
Default: 'SQLite'
272
273
gitcvs.dbuser::
274
- Database user. Only useful if setting `dbdriver`, since
274
+ Database user. Only useful if setting `dbDriver`, since
275
SQLite has no concept of database users. Supports variable
276
substitution (see below).
277
278
-gitcvs.dbpass::
279
- Database password. Only useful if setting `dbdriver`, since
278
+gitcvs.dbPass::
279
+ Database password. Only useful if setting `dbDriver`, since
280
SQLite has no concept of database passwords.
281
282
gitcvs.dbTableNamePrefix::
@@ -288,7 +288,7 @@ All variables can also be set per access method, see <<configaccessmethod,above>
288
289
Variable substitution
290
^^^^^^^^^^^^^^^^^^^^^
291
-In `dbdriver` and `dbuser` you can use the following variables:
291
+In `dbDriver` and `dbUser` you can use the following variables:
292
293
%G::
294
Git directory name
@@ -413,16 +413,16 @@ about end-of-line conversion.
413
414
Alternatively, if `gitcvs.usecrlfattr` config is not enabled
415
or the attributes do not allow automatic detection for a filename, then
416
-the server uses the `gitcvs.allbinary` config for the default setting.
417
-If `gitcvs.allbinary` is set, then file not otherwise
416
+the server uses the `gitcvs.allBinary` config for the default setting.
417
+If `gitcvs.allBinary` is set, then file not otherwise
418
specified will default to '-kb' mode. Otherwise the '-k' mode
419
-is left blank. But if `gitcvs.allbinary` is set to "guess", then
419
+is left blank. But if `gitcvs.allBinary` is set to "guess", then
420
the correct '-k' mode will be guessed based on the contents of
421
the file.
422
423
For best consistency with 'cvs', it is probably best to override the
424
defaults by setting `gitcvs.usecrlfattr` to true,
425
-and `gitcvs.allbinary` to "guess".
425
+and `gitcvs.allBinary` to "guess".
426
427
Dependencies
428
------------
Documentation/git-fetch.txt
+1
-1
@@ -26,7 +26,7 @@ By default, any tag that points into the histories being fetched is
26
also fetched; the effect is to fetch tags that
27
point at branches that you are interested in. This default behavior
28
can be changed by using the --tags or --no-tags options or by
29
-configuring remote.<name>.tagopt. By using a refspec that fetches tags
29
+configuring remote.<name>.tagOpt. By using a refspec that fetches tags
30
explicitly, you can fetch tags that do not point into branches you
31
are interested in as well.
32
Documentation/git-format-patch.txt
+2
-2
@@ -273,13 +273,13 @@ attachments, and sign off patches with configuration variables.
273
------------
274
[format]
275
headers = "Organization: git-foo\n"
276
- subjectprefix = CHANGE
276
+ subjectPrefix = CHANGE
277
suffix = .txt
278
numbered = auto
279
to = <email>
280
cc = <email>
281
attach [ = mime-boundary-string ]
282
- signoff = true
282
+ signOff = true
283
coverletter = auto
284
------------
285
Documentation/git-gc.txt
+6
-6
@@ -54,10 +54,10 @@ all loose objects are combined into a single pack using
54
`git repack -d -l`. Setting the value of `gc.auto` to 0
55
disables automatic packing of loose objects.
56
+
57
-If the number of packs exceeds the value of `gc.autopacklimit`,
57
+If the number of packs exceeds the value of `gc.autoPackLimit`,
58
then existing packs (except those marked with a `.keep` file)
59
are consolidated into a single pack by using the `-A` option of
60
-'git repack'. Setting `gc.autopacklimit` to 0 disables
60
+'git repack'. Setting `gc.autoPackLimit` to 0 disables
61
automatic consolidation of packs.
62
63
--prune=<date>::
@@ -101,18 +101,18 @@ branches:
101
------------
102
[gc "refs/remotes/*"]
103
reflogExpire = never
104
- reflogexpireUnreachable = 3 days
104
+ reflogExpireUnreachable = 3 days
105
------------
106
107
-The optional configuration variable 'gc.rerereresolved' indicates
107
+The optional configuration variable 'gc.rerereResolved' indicates
108
how long records of conflicted merge you resolved earlier are
109
kept. This defaults to 60 days.
110
111
-The optional configuration variable 'gc.rerereunresolved' indicates
111
+The optional configuration variable 'gc.rerereUnresolved' indicates
112
how long records of conflicted merge you have not resolved are
113
kept. This defaults to 15 days.
114
115
-The optional configuration variable 'gc.packrefs' determines if
115
+The optional configuration variable 'gc.packRefs' determines if
116
'git gc' runs 'git pack-refs'. This can be set to "notbare" to enable
117
it within all non-bare repos or it can be set to a boolean value.
118
This defaults to true.
Documentation/git-init.txt
+1
-1
@@ -125,7 +125,7 @@ The template directory will be one of the following (in order):
125
126
- the contents of the `$GIT_TEMPLATE_DIR` environment variable;
127
128
- - the `init.templatedir` configuration variable; or
128
+ - the `init.templateDir` configuration variable; or
129
130
- the default template directory: `/usr/share/git-core/templates`.
131
Documentation/git-instaweb.txt
+1
-1
@@ -76,7 +76,7 @@ You may specify configuration in your .git/config
76
httpd = apache2 -f
77
port = 4321
78
browser = konqueror
79
- modulepath = /usr/lib/apache2/modules
79
+ modulePath = /usr/lib/apache2/modules
80
81
-----------------------------------------------------------------------
82
Documentation/git-log.txt
+1
-1
@@ -184,7 +184,7 @@ log.date::
184
`--date` option.) Defaults to "default", which means to write
185
dates like `Sat May 8 19:35:34 2010 -0500`.
186
187
-log.showroot::
187
+log.showRoot::
188
If `false`, `git log` and related commands will not treat the
189
initial commit as a big creation event. Any root commits in
190
`git log -p` output would be shown without a diff attached.
Documentation/git-merge.txt
+2
-2
@@ -232,7 +232,7 @@ Barbie's remark on your side. The only thing you can tell is that your
232
side wants to say it is hard and you'd prefer to go shopping, while the
233
other side wants to claim it is easy.
234
235
-An alternative style can be used by setting the "merge.conflictstyle"
235
+An alternative style can be used by setting the "merge.conflictStyle"
236
configuration variable to "diff3". In "diff3" style, the above conflict
237
may look like this:
238
@@ -329,7 +329,7 @@ CONFIGURATION
329
-------------
330
include::merge-config.txt[]
331
332
-branch.<name>.mergeoptions::
332
+branch.<name>.mergeOptions::
333
Sets default options for merging into branch <name>. The syntax and
334
supported options are the same as those of 'git merge', but option
335
values containing whitespace characters are currently not supported.
Documentation/git-pull.txt
+1
-1
@@ -117,7 +117,7 @@ locally created merge commits will not be flattened.
117
+
118
When false, merge the current branch into the upstream branch.
119
+
120
-See `pull.rebase`, `branch.<name>.rebase` and `branch.autosetuprebase` in
120
+See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in
121
linkgit:git-config[1] if you want to make `git pull` always use
122
`--rebase` instead of merging.
123
+
Documentation/git-rebase.txt
+3
-3
@@ -207,10 +207,10 @@ rebase.stat::
207
Whether to show a diffstat of what changed upstream since the last
208
rebase. False by default.
209
210
-rebase.autosquash::
210
+rebase.autoSquash::
211
If set to true enable '--autosquash' option by default.
212
213
-rebase.autostash::
213
+rebase.autoStash::
214
If set to true enable '--autostash' option by default.
215
216
OPTIONS
@@ -414,7 +414,7 @@ squash/fixup series.
414
This option is only valid when the '--interactive' option is used.
415
+
416
If the '--autosquash' option is enabled by default using the
417
-configuration variable `rebase.autosquash`, this option can be
417
+configuration variable `rebase.autoSquash`, this option can be
418
used to override and disable this setting.
419
420
--[no-]autostash::
Documentation/git-receive-pack.txt
+1
-1
@@ -100,7 +100,7 @@ the following environment variables:
100
starting time is different by this many seconds from the
101
current session. Only meaningful when
102
`GIT_PUSH_CERT_NONCE_STATUS` says `SLOP`.
103
- Also read about `receive.certnonceslop` variable in
103
+ Also read about `receive.certNonceSlop` variable in
104
linkgit:git-config[1].
105
106
This hook is called before any refname is updated and before any
Documentation/git-repack.txt
+2
-2
@@ -115,7 +115,7 @@ other objects in that pack they already have locally.
115
Write a reachability bitmap index as part of the repack. This
116
only makes sense when used with `-a` or `-A`, as the bitmaps
117
must be able to refer to all reachable objects. This option
118
- overrides the setting of `pack.writebitmaps`.
118
+ overrides the setting of `pack.writeBitmaps`.
119
120
--pack-kept-objects::
121
Include objects in `.keep` files when repacking. Note that we
@@ -123,7 +123,7 @@ other objects in that pack they already have locally.
123
This means that we may duplicate objects, but this makes the
124
option safe to use when there are concurrent pushes or fetches.
125
This option is generally only useful if you are writing bitmaps
126
- with `-b` or `pack.writebitmaps`, as it ensures that the
126
+ with `-b` or `pack.writeBitmaps`, as it ensures that the
127
bitmapped packfile has the necessary objects.
128
129
Configuration
Documentation/git-rerere.txt
+1
-1
@@ -69,7 +69,7 @@ Prune records of conflicted merges that
69
occurred a long time ago. By default, unresolved conflicts older
70
than 15 days and resolved conflicts older than 60
71
days are pruned. These defaults are controlled via the
72
-`gc.rerereunresolved` and `gc.rerereresolved` configuration
72
+`gc.rerereUnresolved` and `gc.rerereResolved` configuration
73
variables respectively.
74
75
Documentation/git-send-email.txt
+25
-25
@@ -47,7 +47,7 @@ Composing
47
--annotate::
48
Review and edit each patch you're about to send. Default is the value
49
of 'sendemail.annotate'. See the CONFIGURATION section for
50
- 'sendemail.multiedit'.
50
+ 'sendemail.multiEdit'.
51
52
--bcc=<address>::
53
Specify a "Bcc:" value for each email. Default is the value of
@@ -73,7 +73,7 @@ and In-Reply-To headers will be used unless they are removed.
73
+
74
Missing From or In-Reply-To headers will be prompted for.
75
+
76
-See the CONFIGURATION section for 'sendemail.multiedit'.
76
+See the CONFIGURATION section for 'sendemail.multiEdit'.
77
78
--from=<address>::
79
Specify the sender of the emails. If not specified on the command line,
@@ -156,31 +156,31 @@ Sending
156
subscribed to a list. In order to use the 'From' address, set the
157
value to "auto". If you use the sendmail binary, you must have
158
suitable privileges for the -f parameter. Default is the value of the
159
- 'sendemail.envelopesender' configuration variable; if that is
159
+ 'sendemail.envelopeSender' configuration variable; if that is
160
unspecified, choosing the envelope sender is left to your MTA.
161
162
--smtp-encryption=<encryption>::
163
Specify the encryption to use, either 'ssl' or 'tls'. Any other
164
value reverts to plain SMTP. Default is the value of
165
- 'sendemail.smtpencryption'.
165
+ 'sendemail.smtpEncryption'.
166
167
--smtp-domain=<FQDN>::
168
Specifies the Fully Qualified Domain Name (FQDN) used in the
169
HELO/EHLO command to the SMTP server. Some servers require the
170
FQDN to match your IP address. If not set, git send-email attempts
171
to determine your FQDN automatically. Default is the value of
172
- 'sendemail.smtpdomain'.
172
+ 'sendemail.smtpDomain'.
173
174
--smtp-pass[=<password>]::
175
Password for SMTP-AUTH. The argument is optional: If no
176
argument is specified, then the empty string is used as
177
- the password. Default is the value of 'sendemail.smtppass',
177
+ the password. Default is the value of 'sendemail.smtpPass',
178
however '--smtp-pass' always overrides this value.
179
+
180
Furthermore, passwords need not be specified in configuration files
181
or on the command line. If a username has been specified (with
182
-'--smtp-user' or a 'sendemail.smtpuser'), but no password has been
183
-specified (with '--smtp-pass' or 'sendemail.smtppass'), then
182
+'--smtp-user' or a 'sendemail.smtpUser'), but no password has been
183
+specified (with '--smtp-pass' or 'sendemail.smtpPass'), then
184
a password is obtained using 'git-credential'.
185
186
--smtp-server=<host>::
@@ -188,7 +188,7 @@ a password is obtained using 'git-credential'.
188
`smtp.example.com` or a raw IP address). Alternatively it can
189
specify a full pathname of a sendmail-like program instead;
190
the program must support the `-i` option. Default value can
191
- be specified by the 'sendemail.smtpserver' configuration
191
+ be specified by the 'sendemail.smtpServer' configuration
192
option; the built-in default is `/usr/sbin/sendmail` or
193
`/usr/lib/sendmail` if such program is available, or
194
`localhost` otherwise.
@@ -199,11 +199,11 @@ a password is obtained using 'git-credential'.
199
submission port 587, or the common SSL smtp port 465);
200
symbolic port names (e.g. "submission" instead of 587)
201
are also accepted. The port can also be set with the
202
- 'sendemail.smtpserverport' configuration variable.
202
+ 'sendemail.smtpServerPort' configuration variable.
203
204
--smtp-server-option=<option>::
205
If set, specifies the outgoing SMTP server option to use.
206
- Default value can be specified by the 'sendemail.smtpserveroption'
206
+ Default value can be specified by the 'sendemail.smtpServerOption'
207
configuration option.
208
+
209
The --smtp-server-option option must be repeated for each option you want
@@ -225,8 +225,8 @@ must be used for each option.
225
be the best choice on most platforms).
226
227
--smtp-user=<user>::
228
- Username for SMTP-AUTH. Default is the value of 'sendemail.smtpuser';
229
- if a username is not specified (with '--smtp-user' or 'sendemail.smtpuser'),
228
+ Username for SMTP-AUTH. Default is the value of 'sendemail.smtpUser';
229
+ if a username is not specified (with '--smtp-user' or 'sendemail.smtpUser'),
230
then authentication is not attempted.
231
232
--smtp-debug=0|1::
@@ -247,14 +247,14 @@ Automating
247
Specify a command to execute once per patch file which
248
should generate patch file specific "Cc:" entries.
249
Output of this command must be single email address per line.
250
- Default is the value of 'sendemail.cccmd' configuration value.
250
+ Default is the value of 'sendemail.ccCmd' configuration value.
251
252
--[no-]chain-reply-to::
253
If this is set, each email will be sent as a reply to the previous
254
email sent. If disabled with "--no-chain-reply-to", all emails after
255
the first will be sent as replies to the first email sent. When using
256
this, it is recommended that the first file given be an overview of the
257
- entire patch series. Disabled by default, but the 'sendemail.chainreplyto'
257
+ entire patch series. Disabled by default, but the 'sendemail.chainReplyTo'
258
configuration variable can be used to enable it.
259
260
--identity=<identity>::
@@ -304,7 +304,7 @@ specified, as well as 'body' if --no-signed-off-cc is specified.
304
305
--[no-]suppress-from::
306
If this is set, do not add the From: address to the cc: list.
307
- Default is the value of 'sendemail.suppressfrom' configuration
307
+ Default is the value of 'sendemail.suppressFrom' configuration
308
value; if that is unspecified, default to --no-suppress-from.
309
310
--[no-]thread::
@@ -377,15 +377,15 @@ default to '--validate'.
377
CONFIGURATION
378
-------------
379
380
-sendemail.aliasesfile::
380
+sendemail.aliasesFile::
381
To avoid typing long email addresses, point this to one or more
382
- email aliases files. You must also supply 'sendemail.aliasfiletype'.
382
+ email aliases files. You must also supply 'sendemail.aliasFileType'.
383
384
-sendemail.aliasfiletype::
385
- Format of the file(s) specified in sendemail.aliasesfile. Must be
384
+sendemail.aliasFileType::
385
+ Format of the file(s) specified in sendemail.aliasesFile. Must be
386
one of 'mutt', 'mailrc', 'pine', 'elm', or 'gnus'.
387
388
-sendemail.multiedit::
388
+sendemail.multiEdit::
389
If true (default), a single editor instance will be spawned to edit
390
files you have to edit (patches when '--annotate' is used, and the
391
summary when '--compose' is used). If false, files will be edited one
@@ -404,10 +404,10 @@ To use 'git send-email' to send your patches through the GMail SMTP server,
404
edit ~/.gitconfig to specify your account settings:
405
406
[sendemail]
407
- smtpencryption = tls
408
- smtpserver = smtp.gmail.com
409
- smtpuser = yourname@gmail.com
410
- smtpserverport = 587
407
+ smtpEncryption = tls
408
+ smtpServer = smtp.gmail.com
409
+ smtpUser = yourname@gmail.com
410
+ smtpServerPort = 587
411
412
Once your commits are ready to be sent to the mailing list, run the
413
following commands:
Documentation/git-status.txt
+2
-2
@@ -77,7 +77,7 @@ configuration variable documented in linkgit:git-config[1].
77
only changes to the commits stored in the superproject are shown (this was
78
the behavior before 1.7.0). Using "all" hides all changes to submodules
79
(and suppresses the output of submodule summaries when the config option
80
- `status.submodulesummary` is set).
80
+ `status.submoduleSummary` is set).
81
82
--ignored::
83
Show ignored files as well.
@@ -207,7 +207,7 @@ If the config variable `status.relativePaths` is set to false, then all
207
paths shown are relative to the repository root, not to the current
208
directory.
209
210
-If `status.submodulesummary` is set to a non zero number or true (identical
210
+If `status.submoduleSummary` is set to a non zero number or true (identical
211
to -1 or an unlimited number), the submodule summary will be enabled for
212
the long format and a summary of commits for modified submodules will be
213
shown (see --summary-limit option of linkgit:git-submodule[1]). Please note
Documentation/git-tag.txt
+1
-1
@@ -161,7 +161,7 @@ it in the repository configuration as follows:
161
162
-------------------------------------
163
[user]
164
- signingkey = <gpg-key-id>
164
+ signingKey = <gpg-key-id>
165
-------------------------------------
166
167
Documentation/git.txt
+1
-1
@@ -918,7 +918,7 @@ for further details.
918
If this environment variable is set, then Git commands which need to
919
acquire passwords or passphrases (e.g. for HTTP or IMAP authentication)
920
will call this program with a suitable prompt as command-line argument
921
- and read the password from its STDOUT. See also the 'core.askpass'
921
+ and read the password from its STDOUT. See also the 'core.askPass'
922
option in linkgit:git-config[1].
923
924
'GIT_TERMINAL_PROMPT'::
Documentation/gitattributes.txt
+1
-1
@@ -80,7 +80,7 @@ Attributes which should be version-controlled and distributed to other
80
repositories (i.e., attributes of interest to all users) should go into
81
`.gitattributes` files. Attributes that should affect all repositories
82
for a single user should be placed in a file specified by the
83
-`core.attributesfile` configuration option (see linkgit:git-config[1]).
83
+`core.attributesFile` configuration option (see linkgit:git-config[1]).
84
Its default value is $XDG_CONFIG_HOME/git/attributes. If $XDG_CONFIG_HOME
85
is either not set or empty, $HOME/.config/git/attributes is used instead.
86
Attributes for all users on a system should be placed in the
Documentation/gitcredentials.txt
+1
-1
@@ -32,7 +32,7 @@ strategies to ask the user for usernames and passwords:
32
to the program on the command line, and the user's input is read
33
from its standard output.
34
35
-2. Otherwise, if the `core.askpass` configuration variable is set, its
35
+2. Otherwise, if the `core.askPass` configuration variable is set, its
36
value is used as above.
37
38
3. Otherwise, if the `SSH_ASKPASS` environment variable is set, its
Documentation/gitignore.txt
+2
-2
@@ -38,7 +38,7 @@ precedence, the last matching pattern decides the outcome):
38
* Patterns read from `$GIT_DIR/info/exclude`.
39
40
* Patterns read from the file specified by the configuration
41
- variable 'core.excludesfile'.
41
+ variable 'core.excludesFile'.
42
43
Which file to place a pattern in depends on how the pattern is meant to
44
be used.
@@ -56,7 +56,7 @@ be used.
56
* Patterns which a user wants Git to
57
ignore in all situations (e.g., backup or temporary files generated by
58
the user's editor of choice) generally go into a file specified by
59
- `core.excludesfile` in the user's `~/.gitconfig`. Its default value is
59
+ `core.excludesFile` in the user's `~/.gitconfig`. Its default value is
60
$XDG_CONFIG_HOME/git/ignore. If $XDG_CONFIG_HOME is either not set or
61
empty, $HOME/.config/git/ignore is used instead.
62
Documentation/gitweb.conf.txt
+1
-1
@@ -706,7 +706,7 @@ show-sizes::
706
I/O. Enabled by default.
707
+
708
This feature can be configured on a per-repository basis via
709
-repository's `gitweb.showsizes` configuration variable (boolean).
709
+repository's `gitweb.showSizes` configuration variable (boolean).
710
711
patches::
712
Enable and configure "patches" view, which displays list of commits in email
Documentation/merge-config.txt
+1
-1
@@ -1,4 +1,4 @@
1
-merge.conflictstyle::
1
+merge.conflictStyle::
2
Specify the style in which conflicted hunks are written out to
3
working tree files upon merge. The default is "merge", which
4
shows a `<<<<<<<` conflict marker, changes made by one side,
Documentation/user-manual.txt
+1
-1
@@ -1200,7 +1200,7 @@ for other users who clone your repository.
1200
If you wish the exclude patterns to affect only certain repositories
1201
(instead of every repository for a given project), you may instead put
1202
them in a file in your repository named `.git/info/exclude`, or in any
1203
-file specified by the `core.excludesfile` configuration variable.
1203
+file specified by the `core.excludesFile` configuration variable.
1204
Some Git commands can also take exclude patterns directly on the
1205
command line. See linkgit:gitignore[5] for the details.
1206