{"thread":{"id":"38771","subject":"[PATCH] config.txt: stick to CamelCase naming convention","startedAt":"2015-03-10T10:39:41Z","lastAt":"2015-03-11T20:32:45Z","messageCount":7,"participants":["Nguyễn Thái Ngọc Duy","Torsten Bögershausen","Eric Sunshine","Junio C Hamano","Duy Nguyen"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"257459","messageId":"1425983981-634-1-git-send-email-pclouds@gmail.com","threadId":"38771","inReplyTo":null,"subject":"[PATCH] config.txt: stick to CamelCase naming convention","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2015-03-10T10:39:41Z","receivedAt":"2015-03-10T10:39:41Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\n---\n .. while I'm looking at config.txt. I think this is the preferred naming\n convention for config keys. I may have missed some in this file but\n this is better than before already.\n\n Documentation/config.txt | 220 +++++++++++++++++++++++------------------------\n 1 file changed, 110 insertions(+), 110 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 1530255..b4cc577 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -225,7 +225,7 @@ See linkgit:git-update-index[1].\n +\n The default is true (when core.filemode is not specified in the config file).\n \n-core.ignorecase::\n+core.ignoreCase::\n \tIf true, this option enables various workarounds to enable\n \tGit to work better on filesystems that are not case sensitive,\n \tlike FAT. For example, if a directory listing finds\n@@ -237,7 +237,7 @@ The default is false, except linkgit:git-clone[1] or linkgit:git-init[1]\n will probe and set core.ignorecase true if appropriate when the repository\n is created.\n \n-core.precomposeunicode::\n+core.precomposeUnicode::\n \tThis option is only used by Mac OS implementation of Git.\n \tWhen core.precomposeunicode=true, Git reverts the unicode decomposition\n \tof filenames done by Mac OS. This is useful when sharing a repository\n@@ -257,20 +257,20 @@ core.protectNTFS::\n \t8.3 \"short\" names.\n \tDefaults to `true` on Windows, and `false` elsewhere.\n \n-core.trustctime::\n+core.trustCTime::\n \tIf false, the ctime differences between the index and the\n \tworking tree are ignored; useful when the inode change time\n \tis regularly modified by something outside Git (file system\n \tcrawlers and some backup systems).\n \tSee linkgit:git-update-index[1]. True by default.\n \n-core.checkstat::\n+core.checkStat::\n \tDetermines which stat fields to match between the index\n \tand work tree. The user can set this to 'default' or\n \t'minimal'. Default (or explicitly 'default'), is to check\n \tall fields, including the sub-second part of mtime and ctime.\n \n-core.quotepath::\n+core.quotePath::\n \tThe commands that output paths (e.g. 'ls-files',\n \t'diff'), when not given the `-z` option, will quote\n \t\"unusual\" characters in the pathname by enclosing the\n@@ -290,7 +290,7 @@ core.eol::\n \tlinkgit:gitattributes[5] for more information on end-of-line\n \tconversion.\n \n-core.safecrlf::\n+core.safeCRLF::\n \tIf true, makes Git check if converting `CRLF` is reversible when\n \tend-of-line conversion is active.  Git will verify if a command\n \tmodifies a file in the work tree either directly or indirectly.\n@@ -335,7 +335,7 @@ consistent, that is either all `LF` or all `CRLF`, but never mixed.  A\n file with mixed line endings would be reported by the `core.safecrlf`\n mechanism.\n \n-core.autocrlf::\n+core.autoCRLF::\n \tSetting this variable to \"true\" is almost the same as setting\n \tthe `text` attribute to \"auto\" on all files except that text\n \tfiles are not guaranteed to be normalized: files that contain\n@@ -476,7 +476,7 @@ core.compression::\n \tIf set, this provides a default to other compression variables,\n \tsuch as 'core.loosecompression' and 'pack.compression'.\n \n-core.loosecompression::\n+core.looseCompression::\n \tAn integer -1..9, indicating the compression level for objects that\n \tare not in a pack file. -1 is the zlib default. 0 means no\n \tcompression, and 1..9 are various speed/size tradeoffs, 9 being\n@@ -537,7 +537,7 @@ be delta compressed, but larger binary media files won't be.\n +\n Common unit suffixes of 'k', 'm', or 'g' are supported.\n \n-core.excludesfile::\n+core.excludesFile::\n \tIn addition to '.gitignore' (per-directory) and\n \t'.git/info/exclude', Git looks into this file for patterns\n \tof files which are not meant to be tracked.  \"`~/`\" is expanded\n@@ -546,7 +546,7 @@ core.excludesfile::\n \tIf $XDG_CONFIG_HOME is either not set or empty, $HOME/.config/git/ignore\n \tis used instead. See linkgit:gitignore[5].\n \n-core.askpass::\n+core.askPass::\n \tSome commands (e.g. svn and http interfaces) that interactively\n \task for a password can be told to use an external program given\n \tvia the value of this variable. Can be overridden by the 'GIT_ASKPASS'\n@@ -555,7 +555,7 @@ core.askpass::\n \tprompt. The external program shall be given a suitable prompt as\n \tcommand-line argument and write the password on its STDOUT.\n \n-core.attributesfile::\n+core.attributesFile::\n \tIn addition to '.gitattributes' (per-directory) and\n \t'.git/info/attributes', Git looks into this file for attributes\n \t(see linkgit:gitattributes[5]). Path expansions are made the same\n@@ -569,7 +569,7 @@ core.editor::\n \tvariable when it is set, and the environment variable\n \t`GIT_EDITOR` is not set.  See linkgit:git-var[1].\n \n-core.commentchar::\n+core.commentChar::\n \tCommands such as `commit` and `tag` that lets you edit\n \tmessages consider a line that begins with this character\n \tcommented, and removes them after the editor returns\n@@ -638,7 +638,7 @@ core.whitespace::\n   is relevant for `indent-with-non-tab` and when Git fixes `tab-in-indent`\n   errors. The default tab width is 8. Allowed values are 1 to 63.\n \n-core.fsyncobjectfiles::\n+core.fsyncObjectFiles::\n \tThis boolean will enable 'fsync()' when writing object files.\n +\n This is a total waste of time and effort on a filesystem that orders\n@@ -646,7 +646,7 @@ data writes properly, but can be useful for filesystems that do not use\n journalling (traditional UNIX filesystems) or that only journal metadata\n and not file contents (OS X's HFS+, or Linux ext3 with \"data=writeback\").\n \n-core.preloadindex::\n+core.preloadIndex::\n \tEnable parallel index preload for operations like 'git diff'\n +\n This can speed up operations like 'git diff' and 'git status' especially\n@@ -710,14 +710,14 @@ not necessarily be the current directory.\n 'GIT_PREFIX' is set as returned by running 'git rev-parse --show-prefix'\n from the original current directory. See linkgit:git-rev-parse[1].\n \n-am.keepcr::\n+am.keepCR::\n \tIf true, git-am will call git-mailsplit for patches in mbox format\n \twith parameter '--keep-cr'. In this case git-mailsplit will\n \tnot remove `\\r` from lines ending with `\\r\\n`. Can be overridden\n \tby giving '--no-keep-cr' from the command line.\n \tSee linkgit:git-am[1], linkgit:git-mailsplit[1].\n \n-apply.ignorewhitespace::\n+apply.ignoreWhitespace::\n \tWhen set to 'change', tells 'git apply' to ignore changes in\n \twhitespace, in the same way as the '--ignore-space-change'\n \toption.\n@@ -729,7 +729,7 @@ apply.whitespace::\n \tTells 'git apply' how to handle whitespaces, in the same way\n \tas the '--whitespace' option. See linkgit:git-apply[1].\n \n-branch.autosetupmerge::\n+branch.autoSetupMerge::\n \tTells 'git branch' and 'git checkout' to set up new branches\n \tso that linkgit:git-pull[1] will appropriately merge from the\n \tstarting point branch. Note that even if this option is not set,\n@@ -741,7 +741,7 @@ branch.autosetupmerge::\n \tlocal branch or remote-tracking\n \tbranch. This option defaults to true.\n \n-branch.autosetuprebase::\n+branch.autoSetupRebase::\n \tWhen a new branch is created with 'git branch' or 'git checkout'\n \tthat tracks another branch, this variable tells Git to set\n \tup pull to rebase instead of merge (see \"branch.<name>.rebase\").\n@@ -767,7 +767,7 @@ branch.<name>.remote::\n \tAdditionally, `.` (a period) is the current local repository\n \t(a dot-repository), see `branch.<name>.merge`'s final note below.\n \n-branch.<name>.pushremote::\n+branch.<name>.pushRemote::\n \tWhen on branch <name>, it overrides `branch.<name>.remote` for\n \tpushing.  It also overrides `remote.pushdefault` for pushing\n \tfrom branch <name>.  When you pull from one place (e.g. your\n@@ -794,7 +794,7 @@ branch.<name>.merge::\n \tbranch.<name>.merge to the desired branch, and use the relative path\n \tsetting `.` (a period) for branch.<name>.remote.\n \n-branch.<name>.mergeoptions::\n+branch.<name>.mergeOptions::\n \tSets default options for merging into branch <name>. The syntax and\n \tsupported options are the same as those of linkgit:git-merge[1], but\n \toption values containing whitespace characters are currently not\n@@ -938,7 +938,7 @@ color.pager::\n \tA boolean to enable/disable colored output when the pager is in\n \tuse (default is true).\n \n-color.showbranch::\n+color.showBranch::\n \tA boolean to enable/disable color in the output of\n \tlinkgit:git-show-branch[1]. May be set to `always`,\n \t`false` (or `never`) or `auto` (or `true`), in which case colors are used\n@@ -1038,7 +1038,7 @@ commit.cleanup::\n \thave to remove the help lines that begin with `#` in the commit log\n \ttemplate yourself, if you do this).\n \n-commit.gpgsign::\n+commit.gpgSign::\n \n \tA boolean to specify whether all commits should be GPG signed.\n \tUse of this option when doing operations such as rebase can\n@@ -1151,7 +1151,7 @@ format.cc::\n \tby mail.  See the --to and --cc options in\n \tlinkgit:git-format-patch[1].\n \n-format.subjectprefix::\n+format.subjectPrefix::\n \tThe default for format-patch is to output files with the '[PATCH]'\n \tsubject prefix. Use this variable to change that prefix.\n \n@@ -1161,7 +1161,7 @@ format.signature::\n \tSet this variable to the empty string (\"\") to suppress\n \tsignature generation.\n \n-format.signaturefile::\n+format.signatureFile::\n \tWorks just like format.signature except the contents of the\n \tfile specified by this variable will be used as the signature.\n \n@@ -1185,7 +1185,7 @@ format.thread::\n \tA true boolean value is the same as `shallow`, and a false\n \tvalue disables threading.\n \n-format.signoff::\n+format.signOff::\n \tA boolean value which lets you enable the `-s/--signoff` option of\n \tformat-patch by default. *Note:* Adding the Signed-off-by: line to a\n \tpatch should be a conscious act and means that you certify you have\n@@ -1224,17 +1224,17 @@ gc.auto::\n \tlight-weight garbage collection from time to time.  The\n \tdefault value is 6700.  Setting this to 0 disables it.\n \n-gc.autopacklimit::\n+gc.autoPackLimit::\n \tWhen there are more than this many packs that are not\n \tmarked with `*.keep` file in the repository, `git gc\n \t--auto` consolidates them into one larger pack.  The\n \tdefault\tvalue is 50.  Setting this to 0 disables it.\n \n-gc.autodetach::\n+gc.autoDetach::\n \tMake `git gc --auto` return immediately and run in background\n \tif the system supports it. Default is true.\n \n-gc.packrefs::\n+gc.packRefs::\n \tRunning `git pack-refs` in a repository renders it\n \tunclonable by Git versions prior to 1.5.1.2 over dumb\n \ttransports such as HTTP.  This variable determines whether\n@@ -1242,38 +1242,38 @@ gc.packrefs::\n \tto enable it within all non-bare repos or it can be set to a\n \tboolean value.  The default is `true`.\n \n-gc.pruneexpire::\n+gc.pruneExpire::\n \tWhen 'git gc' is run, it will call 'prune --expire 2.weeks.ago'.\n \tOverride the grace period with this config variable.  The value\n \t\"now\" may be used to disable this  grace period and always prune\n \tunreachable objects immediately.\n \n-gc.reflogexpire::\n-gc.<pattern>.reflogexpire::\n+gc.reflogExpire::\n+gc.<pattern>.reflogExpire::\n \t'git reflog expire' removes reflog entries older than\n \tthis time; defaults to 90 days.  With \"<pattern>\" (e.g.\n \t\"refs/stash\") in the middle the setting applies only to\n \tthe refs that match the <pattern>.\n \n-gc.reflogexpireunreachable::\n-gc.<ref>.reflogexpireunreachable::\n+gc.reflogExpireUnreachable::\n+gc.<ref>.reflogExpireUnreachable::\n \t'git reflog expire' removes reflog entries older than\n \tthis time and are not reachable from the current tip;\n \tdefaults to 30 days.  With \"<pattern>\" (e.g. \"refs/stash\")\n \tin the middle, the setting applies only to the refs that\n \tmatch the <pattern>.\n \n-gc.rerereresolved::\n+gc.rerereResolved::\n \tRecords of conflicted merge you resolved earlier are\n \tkept for this many days when 'git rerere gc' is run.\n \tThe default is 60 days.  See linkgit:git-rerere[1].\n \n-gc.rerereunresolved::\n+gc.rerereUnresolved::\n \tRecords of conflicted merge you have not resolved are\n \tkept for this many days when 'git rerere gc' is run.\n \tThe default is 15 days.  See linkgit:git-rerere[1].\n \n-gitcvs.commitmsgannotation::\n+gitcvs.commitMsgAnnotation::\n \tAppend this string to each commit message. Set to empty string\n \tto disable this feature. Defaults to \"via git-CVS emulator\".\n \n@@ -1281,11 +1281,11 @@ gitcvs.enabled::\n \tWhether the CVS server interface is enabled for this repository.\n \tSee linkgit:git-cvsserver[1].\n \n-gitcvs.logfile::\n+gitcvs.logFile::\n \tPath to a log file where the CVS server interface well... logs\n \tvarious stuff. See linkgit:git-cvsserver[1].\n \n-gitcvs.usecrlfattr::\n+gitcvs.useCrlfAttr::\n \tIf true, the server will look up the end-of-line conversion\n \tattributes for files to determine the '-k' modes to use. If\n \tthe attributes force Git to treat a file as text,\n@@ -1296,7 +1296,7 @@ gitcvs.usecrlfattr::\n \tthe file type to be determined, then 'gitcvs.allbinary' is\n \tused. See linkgit:gitattributes[5].\n \n-gitcvs.allbinary::\n+gitcvs.allBinary::\n \tThis is used if 'gitcvs.usecrlfattr' does not resolve\n \tthe correct '-kb' mode to use. If true, all\n \tunresolved files are sent to the client in\n@@ -1306,7 +1306,7 @@ gitcvs.allbinary::\n \tthen the contents of the file are examined to decide if\n \tit is binary, similar to 'core.autocrlf'.\n \n-gitcvs.dbname::\n+gitcvs.dbName::\n \tDatabase used by git-cvsserver to cache revision information\n \tderived from the Git repository. The exact meaning depends on the\n \tused database driver, for SQLite (which is the default driver) this\n@@ -1314,7 +1314,7 @@ gitcvs.dbname::\n \tlinkgit:git-cvsserver[1] for details). May not contain semicolons (`;`).\n \tDefault: '%Ggitcvs.%m.sqlite'\n \n-gitcvs.dbdriver::\n+gitcvs.dbDriver::\n \tUsed Perl DBI driver. You can specify any available driver\n \tfor this here, but it might not work. git-cvsserver is tested\n \twith 'DBD::SQLite', reported to work with 'DBD::Pg', and\n@@ -1322,7 +1322,7 @@ gitcvs.dbdriver::\n \tMay not contain double colons (`:`). Default: 'SQLite'.\n \tSee linkgit:git-cvsserver[1].\n \n-gitcvs.dbuser, gitcvs.dbpass::\n+gitcvs.dbUser, gitcvs.dbPass::\n \tDatabase user and password. Only useful if setting 'gitcvs.dbdriver',\n \tsince SQLite has no concept of database users and/or passwords.\n \t'gitcvs.dbuser' supports variable substitution (see\n@@ -1354,7 +1354,7 @@ gitweb.highlight::\n gitweb.patches::\n gitweb.pickaxe::\n gitweb.remote_heads::\n-gitweb.showsizes::\n+gitweb.showSizes::\n gitweb.snapshot::\n \tSee linkgit:gitweb.conf[5] for description.\n \n@@ -1383,15 +1383,15 @@ gpg.program::\n \tsigned, and the program is expected to send the result to its\n \tstandard output.\n \n-gui.commitmsgwidth::\n+gui.commitMsgWidth::\n \tDefines how wide the commit message window is in the\n \tlinkgit:git-gui[1]. \"75\" is the default.\n \n-gui.diffcontext::\n+gui.diffContext::\n \tSpecifies how many context lines should be used in calls to diff\n \tmade by the linkgit:git-gui[1]. The default is \"5\".\n \n-gui.displayuntracked::\n+gui.displayUntracked::\n \tDetermines if linkgit::git-gui[1] shows untracked files\n \tin the file list. The default is \"true\".\n \n@@ -1403,39 +1403,39 @@ gui.encoding::\n \tIf this option is not set, the tools default to the\n \tlocale encoding.\n \n-gui.matchtrackingbranch::\n+gui.matchTrackingBranch::\n \tDetermines if new branches created with linkgit:git-gui[1] should\n \tdefault to tracking remote branches with matching names or\n \tnot. Default: \"false\".\n \n-gui.newbranchtemplate::\n+gui.newBranchTemplate::\n \tIs used as suggested name when creating new branches using the\n \tlinkgit:git-gui[1].\n \n-gui.pruneduringfetch::\n+gui.pruneDuringFetch::\n \t\"true\" if linkgit:git-gui[1] should prune remote-tracking branches when\n \tperforming a fetch. The default value is \"false\".\n \n-gui.trustmtime::\n+gui.trustMTime::\n \tDetermines if linkgit:git-gui[1] should trust the file modification\n \ttimestamp or not. By default the timestamps are not trusted.\n \n-gui.spellingdictionary::\n+gui.spellingDictionary::\n \tSpecifies the dictionary used for spell checking commit messages in\n \tthe linkgit:git-gui[1]. When set to \"none\" spell checking is turned\n \toff.\n \n-gui.fastcopyblame::\n+gui.fastCopyBlame::\n \tIf true, 'git gui blame' uses `-C` instead of `-C -C` for original\n \tlocation detection. It makes blame significantly faster on huge\n \trepositories at the expense of less thorough copy detection.\n \n-gui.copyblamethreshold::\n+gui.copyBlameThreshold::\n \tSpecifies the threshold to use in 'git gui blame' original location\n \tdetection, measured in alphanumeric characters. See the\n \tlinkgit:git-blame[1] manual for more information on copy detection.\n \n-gui.blamehistoryctx::\n+gui.blameHistoryCTX::\n \tSpecifies the radius of history context in days to show in\n \tlinkgit:gitk[1] for the selected commit, when the `Show History\n \tContext` menu item is invoked from 'git gui blame'. If this\n@@ -1450,22 +1450,22 @@ guitool.<name>.cmd::\n \t'FILENAME', and the name of the current branch as 'CUR_BRANCH' (if\n \tthe head is detached, 'CUR_BRANCH' is empty).\n \n-guitool.<name>.needsfile::\n+guitool.<name>.needsFile::\n \tRun the tool only if a diff is selected in the GUI. It guarantees\n \tthat 'FILENAME' is not empty.\n \n-guitool.<name>.noconsole::\n+guitool.<name>.noConsole::\n \tRun the command silently, without creating a window to display its\n \toutput.\n \n-guitool.<name>.norescan::\n+guitool.<name>.noRescan::\n \tDon't rescan the working directory for changes after the tool\n \tfinishes execution.\n \n guitool.<name>.confirm::\n \tShow a confirmation dialog before actually running the tool.\n \n-guitool.<name>.argprompt::\n+guitool.<name>.argPrompt::\n \tRequest a string argument from the user, and pass it to the tool\n \tthrough the 'ARGS' environment variable. Since requesting an\n \targument implies confirmation, the 'confirm' option has no effect\n@@ -1473,12 +1473,12 @@ guitool.<name>.argprompt::\n \tthe dialog uses a built-in generic prompt; otherwise the exact\n \tvalue of the variable is used.\n \n-guitool.<name>.revprompt::\n+guitool.<name>.revPrompt::\n \tRequest a single valid revision from the user, and set the\n \t'REVISION' environment variable. In other aspects this option\n \tis similar to 'argprompt', and can be used together with it.\n \n-guitool.<name>.revunmerged::\n+guitool.<name>.revUnmerged::\n \tShow only unmerged branches in the 'revprompt' subdialog.\n \tThis is useful for tools similar to merge or rebase, but not\n \tfor things like checkout or reset.\n@@ -1501,7 +1501,7 @@ help.format::\n \tValues 'man', 'info', 'web' and 'html' are supported. 'man' is\n \tthe default. 'web' and 'html' are the same.\n \n-help.autocorrect::\n+help.autoCorrect::\n \tAutomatically correct and execute mistyped commands after\n \twaiting for the given number of deciseconds (0.1 sec). If more\n \tthan one command can be deduced from the entered text, nothing\n@@ -1510,7 +1510,7 @@ help.autocorrect::\n \tvalue is 0 - the command will be just shown but not executed.\n \tThis is the default.\n \n-help.htmlpath::\n+help.htmlPath::\n \tSpecify the path where the HTML documentation resides. File system paths\n \tand URLs are supported. HTML pages will be prefixed with this path when\n \thelp is displayed in the 'web' format. This defaults to the documentation\n@@ -1522,7 +1522,7 @@ http.proxy::\n \t`curl(1)`).  This can be overridden on a per-remote basis; see\n \tremote.<name>.proxy\n \n-http.cookiefile::\n+http.cookieFile::\n \tFile containing previously stored cookie lines which should be used\n \tin the Git http session, if they match the server. The file format\n \tof the file to read cookies from should be plain HTTP headers or\n@@ -1530,7 +1530,7 @@ http.cookiefile::\n \tNOTE that the file specified with http.cookiefile is only used as\n \tinput unless http.saveCookies is set.\n \n-http.savecookies::\n+http.saveCookies::\n \tIf set, store cookies received during requests to the file specified by\n \thttp.cookiefile. Has no effect if http.cookiefile is unset.\n \n@@ -1603,7 +1603,7 @@ http.noEPSV::\n \tsupport EPSV mode. Can be overridden by the 'GIT_CURL_FTP_NO_EPSV'\n \tenvironment variable. Default is false (curl will use EPSV).\n \n-http.useragent::\n+http.userAgent::\n \tThe HTTP USER_AGENT string presented to an HTTP server.  The default\n \tvalue represents the version of the client Git such as git/1.7.1.\n \tThis option allows you to override this value to a more common value\n@@ -1676,7 +1676,7 @@ index.version::\n \tSpecify the version with which new index files should be\n \tinitialized.  This does not affect existing repositories.\n \n-init.templatedir::\n+init.templateDir::\n \tSpecify the directory from which templates will be copied.\n \t(See the \"TEMPLATE DIRECTORY\" section of linkgit:git-init[1].)\n \n@@ -1692,7 +1692,7 @@ instaweb.local::\n \tIf true the web server started by linkgit:git-instaweb[1] will\n \tbe bound to the local IP (127.0.0.1).\n \n-instaweb.modulepath::\n+instaweb.modulePath::\n \tThe default module path for linkgit:git-instaweb[1] to use\n \tinstead of /usr/lib/apache2/modules.  Only used if httpd\n \tis Apache.\n@@ -1701,7 +1701,7 @@ instaweb.port::\n \tThe port number to bind the gitweb httpd to. See\n \tlinkgit:git-instaweb[1].\n \n-interactive.singlekey::\n+interactive.singleKey::\n \tIn interactive commands, allow the user to provide one-letter\n \tinput with a single key (i.e., without hitting enter).\n \tCurrently this is used by the `--patch` mode of\n@@ -1729,7 +1729,7 @@ log.decorate::\n \tspecified, the full ref name (including prefix) will be printed.\n \tThis is the same as the log commands '--decorate' option.\n \n-log.showroot::\n+log.showRoot::\n \tIf true, the initial commit will be shown as a big creation event.\n \tThis is equivalent to a diff against an empty tree.\n \tTools like linkgit:git-log[1] or linkgit:git-whatchanged[1], which\n@@ -1966,7 +1966,7 @@ pack.useBitmaps::\n \ttrue. You should not generally need to turn this off unless\n \tyou are debugging pack bitmaps.\n \n-pack.writebitmaps (deprecated)::\n+pack.writeBitmaps (deprecated)::\n \tThis is a deprecated synonym for `repack.writeBitmaps`.\n \n pack.writeBitmapHashCache::\n@@ -2089,10 +2089,10 @@ rebase.stat::\n \tWhether to show a diffstat of what changed upstream since the last\n \trebase. False by default.\n \n-rebase.autosquash::\n+rebase.autoSquash::\n \tIf set to true enable '--autosquash' option by default.\n \n-rebase.autostash::\n+rebase.autoStash::\n \tWhen set to true, automatically create a temporary stash\n \tbefore the operation begins, and apply it after the operation\n \tends.  This means that you can run rebase on a dirty worktree.\n@@ -2100,23 +2100,23 @@ rebase.autostash::\n \tsuccessful rebase might result in non-trivial conflicts.\n \tDefaults to false.\n \n-receive.advertiseatomic::\n+receive.advertiseAtomic::\n \tBy default, git-receive-pack will advertise the atomic push\n \tcapability to its clients. If you don't want to this capability\n \tto be advertised, set this variable to false.\n \n-receive.autogc::\n+receive.autoGC::\n \tBy default, git-receive-pack will run \"git-gc --auto\" after\n \treceiving data from git-push and updating refs.  You can stop\n \tit by setting this variable to false.\n \n-receive.certnonceseed::\n+receive.certNonceSeed::\n \tBy setting this variable to a string, `git receive-pack`\n \twill accept a `git push --signed` and verifies it by using\n \ta \"nonce\" protected by HMAC using this string as a secret\n \tkey.\n \n-receive.certnonceslop::\n+receive.certNonceSlop::\n \tWhen a `git push --signed` sent a push certificate with a\n \t\"nonce\" that was issued by a receive-pack serving the same\n \trepository within this many seconds, export the \"nonce\"\n@@ -2180,7 +2180,7 @@ receive.denyNonFastForwards::\n \teven if that push is forced. This configuration variable is\n \tset when initializing a shared repository.\n \n-receive.hiderefs::\n+receive.hideRefs::\n \tString(s) `receive-pack` uses to decide which refs to omit\n \tfrom its initial advertisement.  Use more than one\n \tdefinitions to specify multiple prefix strings. A ref that\n@@ -2189,15 +2189,15 @@ receive.hiderefs::\n \tpush`, and an attempt to update or delete a hidden ref by\n \t`git push` is rejected.\n \n-receive.updateserverinfo::\n+receive.updateServerInfo::\n \tIf set to true, git-receive-pack will run git-update-server-info\n \tafter receiving data from git-push and updating refs.\n \n-receive.shallowupdate::\n+receive.shallowUpdate::\n \tIf set to true, .git/shallow can be updated when new refs\n \trequire new shallow roots. Otherwise those refs are rejected.\n \n-remote.pushdefault::\n+remote.pushDefault::\n \tThe remote to push to by default.  Overrides\n \t`branch.<name>.remote` for all branches, and is overridden by\n \t`branch.<name>.pushremote` for specific branches.\n@@ -2206,7 +2206,7 @@ remote.<name>.url::\n \tThe URL of a remote repository.  See linkgit:git-fetch[1] or\n \tlinkgit:git-push[1].\n \n-remote.<name>.pushurl::\n+remote.<name>.pushURL::\n \tThe push URL of a remote repository.  See linkgit:git-push[1].\n \n remote.<name>.proxy::\n@@ -2244,7 +2244,7 @@ remote.<name>.uploadpack::\n \tThe default program to execute on the remote side when fetching.  See\n \toption \\--upload-pack of linkgit:git-fetch-pack[1].\n \n-remote.<name>.tagopt::\n+remote.<name>.tagOpt::\n \tSetting this value to \\--no-tags disables automatic tag following when\n \tfetching from remote <name>. Setting it to \\--tags will fetch every\n \ttag from remote <name>, even if they are not reachable from remote\n@@ -2266,7 +2266,7 @@ remotes.<group>::\n \tThe list of remotes which are fetched by \"git remote update\n \t<group>\".  See linkgit:git-remote[1].\n \n-repack.usedeltabaseoffset::\n+repack.useDeltaBaseOffset::\n \tBy default, linkgit:git-repack[1] creates packs that use\n \tdelta-base offset. If you need to share your repository with\n \tGit older than version 1.4.4, either directly or via a dumb\n@@ -2289,7 +2289,7 @@ repack.writeBitmaps::\n \tspace and extra time spent on the initial repack.  Defaults to\n \tfalse.\n \n-rerere.autoupdate::\n+rerere.autoUpdate::\n \tWhen set to true, `git-rerere` updates the index with the\n \tresulting contents after it cleanly resolves conflicts using\n \tpreviously recorded resolution.  Defaults to false.\n@@ -2308,14 +2308,14 @@ sendemail.identity::\n \tvalues in the 'sendemail' section. The default identity is\n \tthe value of 'sendemail.identity'.\n \n-sendemail.smtpencryption::\n+sendemail.smtpEncryption::\n \tSee linkgit:git-send-email[1] for description.  Note that this\n \tsetting is not subject to the 'identity' mechanism.\n \n-sendemail.smtpssl (deprecated)::\n+sendemail.smtpSSL (deprecated)::\n \tDeprecated alias for 'sendemail.smtpencryption = ssl'.\n \n-sendemail.smtpsslcertpath::\n+sendemail.smtpSslCertPath::\n \tPath to ca-certificates (either a directory or a single file).\n \tSet it to an empty string to disable certificate verification.\n \n@@ -2325,34 +2325,34 @@ sendemail.<identity>.*::\n \tidentity is selected, through command-line or\n \t'sendemail.identity'.\n \n-sendemail.aliasesfile::\n-sendemail.aliasfiletype::\n+sendemail.aliasesFile::\n+sendemail.aliasFileType::\n sendemail.annotate::\n sendemail.bcc::\n sendemail.cc::\n-sendemail.cccmd::\n-sendemail.chainreplyto::\n+sendemail.ccCmd::\n+sendemail.chainReplyTo::\n sendemail.confirm::\n-sendemail.envelopesender::\n+sendemail.envelopeSender::\n sendemail.from::\n-sendemail.multiedit::\n-sendemail.signedoffbycc::\n-sendemail.smtppass::\n-sendemail.suppresscc::\n-sendemail.suppressfrom::\n+sendemail.multiEdit::\n+sendemail.signedOffByCC::\n+sendemail.smtpPass::\n+sendemail.suppressCC::\n+sendemail.suppressFrom::\n sendemail.to::\n-sendemail.smtpdomain::\n-sendemail.smtpserver::\n-sendemail.smtpserverport::\n-sendemail.smtpserveroption::\n-sendemail.smtpuser::\n+sendemail.smtpDomain::\n+sendemail.smtpServer::\n+sendemail.smtpServerPort::\n+sendemail.smtpServerOption::\n+sendemail.smtpUser::\n sendemail.thread::\n-sendemail.transferencoding::\n+sendemail.transferEncoding::\n sendemail.validate::\n sendemail.xmailer::\n \tSee linkgit:git-send-email[1] for description.\n \n-sendemail.signedoffcc (deprecated)::\n+sendemail.signedOffCC (deprecated)::\n \tDeprecated alias for 'sendemail.signedoffbycc'.\n \n showbranch.default::\n@@ -2399,7 +2399,7 @@ If this variable is not specified, it defaults to 'normal'.\n This variable can be overridden with the -u|--untracked-files option\n of linkgit:git-status[1] and linkgit:git-commit[1].\n \n-status.submodulesummary::\n+status.submoduleSummary::\n \tDefaults to false.\n \tIf this is set to a non zero number or true (identical to -1 or an\n \tunlimited number), the submodule summary will be enabled and a\n@@ -2474,7 +2474,7 @@ transfer.fsckObjects::\n \tnot set, the value of this variable is used instead.\n \tDefaults to false.\n \n-transfer.hiderefs::\n+transfer.hideRefs::\n \tThis variable can be used to set both `receive.hiderefs`\n \tand `uploadpack.hiderefs` at the same time to the same\n \tvalues.  See entries for these other variables.\n@@ -2491,7 +2491,7 @@ uploadarchive.allowUnreachable::\n \tlinkgit:git-upload-archive[1] for more details. Defaults to\n \t`false`.\n \n-uploadpack.hiderefs::\n+uploadpack.hideRefs::\n \tString(s) `upload-pack` uses to decide which refs to omit\n \tfrom its initial advertisement.  Use more than one\n \tdefinitions to specify multiple prefix strings. A ref that\n@@ -2500,13 +2500,13 @@ uploadpack.hiderefs::\n \t`git fetch`, etc.  An attempt to fetch a hidden ref by `git\n \tfetch` will fail.  See also `uploadpack.allowtipsha1inwant`.\n \n-uploadpack.allowtipsha1inwant::\n+uploadpack.allowTipSHA1InWant::\n \tWhen `uploadpack.hiderefs` is in effect, allow `upload-pack`\n \tto accept a fetch request that asks for an object at the tip\n \tof a hidden ref (by default, such a request is rejected).\n \tsee also `uploadpack.hiderefs`.\n \n-uploadpack.keepalive::\n+uploadpack.keepAlive::\n \tWhen `upload-pack` has started `pack-objects`, there may be a\n \tquiet period while `pack-objects` prepares the pack. Normally\n \tit would output progress information, but if `--quiet` was used\n@@ -2551,7 +2551,7 @@ user.name::\n \tCan be overridden by the 'GIT_AUTHOR_NAME' and 'GIT_COMMITTER_NAME'\n \tenvironment variables.  See linkgit:git-commit-tree[1].\n \n-user.signingkey::\n+user.signingKey::\n \tIf linkgit:git-tag[1] or linkgit:git-commit[1] is not selecting the\n \tkey you want it to automatically when creating a signed tag or\n \tcommit, you can override the default selection with this variable.\n-- \n2.3.0.rc1.137.g477eb31\n"},{"id":"257473","messageId":"54FEFB7E.4020209@web.de","threadId":"38771","inReplyTo":"1425983981-634-1-git-send-email-pclouds@gmail.com","subject":"Re: [PATCH] config.txt: stick to CamelCase naming convention","fromName":"Torsten Bögershausen","fromEmail":"tboegi@web.de","sentAt":"2015-03-10T14:11:10Z","receivedAt":"2015-03-10T14:11:10Z","isPatch":true,"sender":{"key":"tboegi@web.de","avatar":"https://avatars.githubusercontent.com/u/7138363?v=4"},"body":"On 10.03.15 11:39, Nguyễn Thái Ngọc Duy wrote:\n> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\n> ---\n>  .. while I'm looking at config.txt. I think this is the preferred naming\n>  convention for config keys. \n\nI think the default is unix-like lowercase,\nthis is what Git itself produces. \n(core.ignorecase, core.filemode, core.precomposeunicode)\n"},{"id":"257496","messageId":"CAPig+cRkV++D9-yYWOv3FmBtTuWz1_Et23Xk=8cg8=7_E1PZug@mail.gmail.com","threadId":"38771","inReplyTo":"1425983981-634-1-git-send-email-pclouds@gmail.com","subject":"Re: [PATCH] config.txt: stick to CamelCase naming convention","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2015-03-10T20:34:35Z","receivedAt":"2015-03-10T20:34:35Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Tue, Mar 10, 2015 at 6:39 AM, Nguyễn Thái Ngọc Duy <pclouds@gmail.com> wrote:\n> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\n> ---\n> diff --git a/Documentation/config.txt b/Documentation/config.txt\n> index 1530255..b4cc577 100644\n> --- a/Documentation/config.txt\n> +++ b/Documentation/config.txt\n> @@ -257,20 +257,20 @@ core.protectNTFS::\n>         8.3 \"short\" names.\n>         Defaults to `true` on Windows, and `false` elsewhere.\n>\n> -core.trustctime::\n> +core.trustCTime::\n\nI personally find this a bit odd. 'ctime' is always typed exactly like\nthat; never 'cTime' or 'Ctime' or 'CTime'.\n\n>         If false, the ctime differences between the index and the\n>         working tree are ignored; useful when the inode change time\n>         is regularly modified by something outside Git (file system\n>         crawlers and some backup systems).\n>         See linkgit:git-update-index[1]. True by default.\n>\n> @@ -290,7 +290,7 @@ core.eol::\n>         linkgit:gitattributes[5] for more information on end-of-line\n>         conversion.\n>\n> -core.safecrlf::\n> +core.safeCRLF::\n\nHere, you uppercase the entire acronym, \"CRLF\"...\n\n>         If true, makes Git check if converting `CRLF` is reversible when\n>         end-of-line conversion is active.  Git will verify if a command\n>         modifies a file in the work tree either directly or indirectly.\n> @@ -1281,11 +1281,11 @@ gitcvs.enabled::\n>         Path to a log file where the CVS server interface well... logs\n>         various stuff. See linkgit:git-cvsserver[1].\n>\n> -gitcvs.usecrlfattr::\n> +gitcvs.useCrlfAttr::\n\nBut, here you only capitalized it: \"Crlf\".\n\n>         If true, the server will look up the end-of-line conversion\n>         attributes for files to determine the '-k' modes to use. If\n>         the attributes force Git to treat a file as text,\n> @@ -1403,39 +1403,39 @@ gui.encoding::\n>         \"true\" if linkgit:git-gui[1] should prune remote-tracking branches when\n>         performing a fetch. The default value is \"false\".\n>\n> -gui.trustmtime::\n> +gui.trustMTime::\n\nDitto comment regarding strangeness of seeing 'mtime' typed any way\nother than 'mtime'.\n\n>         Determines if linkgit:git-gui[1] should trust the file modification\n>         timestamp or not. By default the timestamps are not trusted.\n>\n>         Specifies the threshold to use in 'git gui blame' original location\n>         detection, measured in alphanumeric characters. See the\n>         linkgit:git-blame[1] manual for more information on copy detection.\n>\n> -gui.blamehistoryctx::\n> +gui.blameHistoryCTX::\n\nYou've uppercased acronyms (such as CRLF, URL, SSL), however, \"ctx\" is\nmerely an abbreviation of \"context\", not an acronym. As such, \"Ctx\"\nseems more correct.\n\n>         Specifies the radius of history context in days to show in\n>         linkgit:gitk[1] for the selected commit, when the `Show History\n>         Context` menu item is invoked from 'git gui blame'. If this\n> @@ -2308,14 +2308,14 @@ sendemail.identity::\n>         See linkgit:git-send-email[1] for description.  Note that this\n>         setting is not subject to the 'identity' mechanism.\n>\n> -sendemail.smtpssl (deprecated)::\n> +sendemail.smtpSSL (deprecated)::\n\nHere, \"SSL\"...\n\n>         Deprecated alias for 'sendemail.smtpencryption = ssl'.\n>\n> -sendemail.smtpsslcertpath::\n> +sendemail.smtpSslCertPath::\n\nBut here, inconsistently, \"Ssl\".\n\n>         Path to ca-certificates (either a directory or a single file).\n>         Set it to an empty string to disable certificate verification.\n>\n"},{"id":"257516","messageId":"xmqqfv9cxwsm.fsf@gitster.dls.corp.google.com","threadId":"38771","inReplyTo":"CAPig+cRkV++D9-yYWOv3FmBtTuWz1_Et23Xk=8cg8=7_E1PZug@mail.gmail.com","subject":"Re: [PATCH] config.txt: stick to CamelCase naming convention","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-03-10T23:22:33Z","receivedAt":"2015-03-10T23:22:33Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Eric Sunshine <sunshine@sunshineco.com> writes:\n\n>> @@ -2308,14 +2308,14 @@ sendemail.identity::\n>>         See linkgit:git-send-email[1] for description.  Note that this\n>>         setting is not subject to the 'identity' mechanism.\n>>\n>> -sendemail.smtpssl (deprecated)::\n>> +sendemail.smtpSSL (deprecated)::\n>\n> Here, \"SSL\"...\n\nand not \"SMTP\".  Now what should the rule be when two acronyms sit\nnext to each other?\n\nI personally feel that we should first fix the obvious\n\"multipleWords\" ones without worrying about abbreviations like ctx\nand acronyms and then debate to come up with the rules for the\nlatter two classes.  Most of the ones in the patch look like\n\"multipleWords\" kind that should be uncontroversial.\n\nDuy, thanks for starting this.\n"},{"id":"257552","messageId":"CACsJy8BCfLMuvCxqnbKqNMx=iytDyUXZ7_LjibWVS+KGc5JNEQ@mail.gmail.com","threadId":"38771","inReplyTo":"54FEFB7E.4020209@web.de","subject":"Re: [PATCH] config.txt: stick to CamelCase naming convention","fromName":"Duy Nguyen","fromEmail":"pclouds@gmail.com","sentAt":"2015-03-11T12:17:13Z","receivedAt":"2015-03-11T12:17:13Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"On Tue, Mar 10, 2015 at 9:11 PM, Torsten Bögershausen <tboegi@web.de> wrote:\n> On 10.03.15 11:39, Nguyễn Thái Ngọc Duy wrote:\n>> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\n>> ---\n>>  .. while I'm looking at config.txt. I think this is the preferred naming\n>>  convention for config keys.\n>\n> I think the default is unix-like lowercase,\n> this is what Git itself produces.\n> (core.ignorecase, core.filemode, core.precomposeunicode)\n\nYou made me look back in history. Nobody actually mentioned about\nfilemode vs fileMode. And config.txt is a mixed bag. But I think\nfileMode is better for reading.\n-- \nDuy\n"},{"id":"257553","messageId":"1426076418-13741-1-git-send-email-pclouds@gmail.com","threadId":"38771","inReplyTo":"xmqqfv9cxwsm.fsf@gitster.dls.corp.google.com","subject":"[PATCH v2] *config.txt: stick to camelCase naming convention","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2015-03-11T12:20:18Z","receivedAt":"2015-03-11T12:20:18Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"This should improve readability. Compare \"thislongname\" and\n\"thisLongName\". The following keys are left in unchanged. We can\ndecide what to do with them later.\n\n - am.keepcr\n - core.autocrlf .safecrlf .trustctime\n - diff.dirstat .noprefix\n - gitcvs.usecrlfattr\n - gui.blamehistoryctx .trustmtime\n - pull.twohead\n - receive.autogc\n - sendemail.signedoffbycc .smtpsslcertpath .suppresscc\n\nSigned-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\n---\n Documentation/config.txt       | 190 ++++++++++++++++++++---------------------\n Documentation/diff-config.txt  |   8 +-\n Documentation/merge-config.txt |   2 +-\n 3 files changed, 100 insertions(+), 100 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 1530255..54ae0f6 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -225,7 +225,7 @@ See linkgit:git-update-index[1].\n +\n The default is true (when core.filemode is not specified in the config file).\n \n-core.ignorecase::\n+core.ignoreCase::\n \tIf true, this option enables various workarounds to enable\n \tGit to work better on filesystems that are not case sensitive,\n \tlike FAT. For example, if a directory listing finds\n@@ -237,7 +237,7 @@ The default is false, except linkgit:git-clone[1] or linkgit:git-init[1]\n will probe and set core.ignorecase true if appropriate when the repository\n is created.\n \n-core.precomposeunicode::\n+core.precomposeUnicode::\n \tThis option is only used by Mac OS implementation of Git.\n \tWhen core.precomposeunicode=true, Git reverts the unicode decomposition\n \tof filenames done by Mac OS. This is useful when sharing a repository\n@@ -264,13 +264,13 @@ core.trustctime::\n \tcrawlers and some backup systems).\n \tSee linkgit:git-update-index[1]. True by default.\n \n-core.checkstat::\n+core.checkStat::\n \tDetermines which stat fields to match between the index\n \tand work tree. The user can set this to 'default' or\n \t'minimal'. Default (or explicitly 'default'), is to check\n \tall fields, including the sub-second part of mtime and ctime.\n \n-core.quotepath::\n+core.quotePath::\n \tThe commands that output paths (e.g. 'ls-files',\n \t'diff'), when not given the `-z` option, will quote\n \t\"unusual\" characters in the pathname by enclosing the\n@@ -476,7 +476,7 @@ core.compression::\n \tIf set, this provides a default to other compression variables,\n \tsuch as 'core.loosecompression' and 'pack.compression'.\n \n-core.loosecompression::\n+core.looseCompression::\n \tAn integer -1..9, indicating the compression level for objects that\n \tare not in a pack file. -1 is the zlib default. 0 means no\n \tcompression, and 1..9 are various speed/size tradeoffs, 9 being\n@@ -537,7 +537,7 @@ be delta compressed, but larger binary media files won't be.\n +\n Common unit suffixes of 'k', 'm', or 'g' are supported.\n \n-core.excludesfile::\n+core.excludesFile::\n \tIn addition to '.gitignore' (per-directory) and\n \t'.git/info/exclude', Git looks into this file for patterns\n \tof files which are not meant to be tracked.  \"`~/`\" is expanded\n@@ -546,7 +546,7 @@ core.excludesfile::\n \tIf $XDG_CONFIG_HOME is either not set or empty, $HOME/.config/git/ignore\n \tis used instead. See linkgit:gitignore[5].\n \n-core.askpass::\n+core.askPass::\n \tSome commands (e.g. svn and http interfaces) that interactively\n \task for a password can be told to use an external program given\n \tvia the value of this variable. Can be overridden by the 'GIT_ASKPASS'\n@@ -555,7 +555,7 @@ core.askpass::\n \tprompt. The external program shall be given a suitable prompt as\n \tcommand-line argument and write the password on its STDOUT.\n \n-core.attributesfile::\n+core.attributesFile::\n \tIn addition to '.gitattributes' (per-directory) and\n \t'.git/info/attributes', Git looks into this file for attributes\n \t(see linkgit:gitattributes[5]). Path expansions are made the same\n@@ -569,7 +569,7 @@ core.editor::\n \tvariable when it is set, and the environment variable\n \t`GIT_EDITOR` is not set.  See linkgit:git-var[1].\n \n-core.commentchar::\n+core.commentChar::\n \tCommands such as `commit` and `tag` that lets you edit\n \tmessages consider a line that begins with this character\n \tcommented, and removes them after the editor returns\n@@ -638,7 +638,7 @@ core.whitespace::\n   is relevant for `indent-with-non-tab` and when Git fixes `tab-in-indent`\n   errors. The default tab width is 8. Allowed values are 1 to 63.\n \n-core.fsyncobjectfiles::\n+core.fsyncObjectFiles::\n \tThis boolean will enable 'fsync()' when writing object files.\n +\n This is a total waste of time and effort on a filesystem that orders\n@@ -646,7 +646,7 @@ data writes properly, but can be useful for filesystems that do not use\n journalling (traditional UNIX filesystems) or that only journal metadata\n and not file contents (OS X's HFS+, or Linux ext3 with \"data=writeback\").\n \n-core.preloadindex::\n+core.preloadIndex::\n \tEnable parallel index preload for operations like 'git diff'\n +\n This can speed up operations like 'git diff' and 'git status' especially\n@@ -717,7 +717,7 @@ am.keepcr::\n \tby giving '--no-keep-cr' from the command line.\n \tSee linkgit:git-am[1], linkgit:git-mailsplit[1].\n \n-apply.ignorewhitespace::\n+apply.ignoreWhitespace::\n \tWhen set to 'change', tells 'git apply' to ignore changes in\n \twhitespace, in the same way as the '--ignore-space-change'\n \toption.\n@@ -729,7 +729,7 @@ apply.whitespace::\n \tTells 'git apply' how to handle whitespaces, in the same way\n \tas the '--whitespace' option. See linkgit:git-apply[1].\n \n-branch.autosetupmerge::\n+branch.autoSetupMerge::\n \tTells 'git branch' and 'git checkout' to set up new branches\n \tso that linkgit:git-pull[1] will appropriately merge from the\n \tstarting point branch. Note that even if this option is not set,\n@@ -741,7 +741,7 @@ branch.autosetupmerge::\n \tlocal branch or remote-tracking\n \tbranch. This option defaults to true.\n \n-branch.autosetuprebase::\n+branch.autoSetupRebase::\n \tWhen a new branch is created with 'git branch' or 'git checkout'\n \tthat tracks another branch, this variable tells Git to set\n \tup pull to rebase instead of merge (see \"branch.<name>.rebase\").\n@@ -767,7 +767,7 @@ branch.<name>.remote::\n \tAdditionally, `.` (a period) is the current local repository\n \t(a dot-repository), see `branch.<name>.merge`'s final note below.\n \n-branch.<name>.pushremote::\n+branch.<name>.pushRemote::\n \tWhen on branch <name>, it overrides `branch.<name>.remote` for\n \tpushing.  It also overrides `remote.pushdefault` for pushing\n \tfrom branch <name>.  When you pull from one place (e.g. your\n@@ -794,7 +794,7 @@ branch.<name>.merge::\n \tbranch.<name>.merge to the desired branch, and use the relative path\n \tsetting `.` (a period) for branch.<name>.remote.\n \n-branch.<name>.mergeoptions::\n+branch.<name>.mergeOptions::\n \tSets default options for merging into branch <name>. The syntax and\n \tsupported options are the same as those of linkgit:git-merge[1], but\n \toption values containing whitespace characters are currently not\n@@ -938,7 +938,7 @@ color.pager::\n \tA boolean to enable/disable colored output when the pager is in\n \tuse (default is true).\n \n-color.showbranch::\n+color.showBranch::\n \tA boolean to enable/disable color in the output of\n \tlinkgit:git-show-branch[1]. May be set to `always`,\n \t`false` (or `never`) or `auto` (or `true`), in which case colors are used\n@@ -1038,7 +1038,7 @@ commit.cleanup::\n \thave to remove the help lines that begin with `#` in the commit log\n \ttemplate yourself, if you do this).\n \n-commit.gpgsign::\n+commit.gpgSign::\n \n \tA boolean to specify whether all commits should be GPG signed.\n \tUse of this option when doing operations such as rebase can\n@@ -1151,7 +1151,7 @@ format.cc::\n \tby mail.  See the --to and --cc options in\n \tlinkgit:git-format-patch[1].\n \n-format.subjectprefix::\n+format.subjectPrefix::\n \tThe default for format-patch is to output files with the '[PATCH]'\n \tsubject prefix. Use this variable to change that prefix.\n \n@@ -1161,7 +1161,7 @@ format.signature::\n \tSet this variable to the empty string (\"\") to suppress\n \tsignature generation.\n \n-format.signaturefile::\n+format.signatureFile::\n \tWorks just like format.signature except the contents of the\n \tfile specified by this variable will be used as the signature.\n \n@@ -1185,7 +1185,7 @@ format.thread::\n \tA true boolean value is the same as `shallow`, and a false\n \tvalue disables threading.\n \n-format.signoff::\n+format.signOff::\n \tA boolean value which lets you enable the `-s/--signoff` option of\n \tformat-patch by default. *Note:* Adding the Signed-off-by: line to a\n \tpatch should be a conscious act and means that you certify you have\n@@ -1224,17 +1224,17 @@ gc.auto::\n \tlight-weight garbage collection from time to time.  The\n \tdefault value is 6700.  Setting this to 0 disables it.\n \n-gc.autopacklimit::\n+gc.autoPackLimit::\n \tWhen there are more than this many packs that are not\n \tmarked with `*.keep` file in the repository, `git gc\n \t--auto` consolidates them into one larger pack.  The\n \tdefault\tvalue is 50.  Setting this to 0 disables it.\n \n-gc.autodetach::\n+gc.autoDetach::\n \tMake `git gc --auto` return immediately and run in background\n \tif the system supports it. Default is true.\n \n-gc.packrefs::\n+gc.packRefs::\n \tRunning `git pack-refs` in a repository renders it\n \tunclonable by Git versions prior to 1.5.1.2 over dumb\n \ttransports such as HTTP.  This variable determines whether\n@@ -1242,38 +1242,38 @@ gc.packrefs::\n \tto enable it within all non-bare repos or it can be set to a\n \tboolean value.  The default is `true`.\n \n-gc.pruneexpire::\n+gc.pruneExpire::\n \tWhen 'git gc' is run, it will call 'prune --expire 2.weeks.ago'.\n \tOverride the grace period with this config variable.  The value\n \t\"now\" may be used to disable this  grace period and always prune\n \tunreachable objects immediately.\n \n-gc.reflogexpire::\n-gc.<pattern>.reflogexpire::\n+gc.reflogExpire::\n+gc.<pattern>.reflogExpire::\n \t'git reflog expire' removes reflog entries older than\n \tthis time; defaults to 90 days.  With \"<pattern>\" (e.g.\n \t\"refs/stash\") in the middle the setting applies only to\n \tthe refs that match the <pattern>.\n \n-gc.reflogexpireunreachable::\n-gc.<ref>.reflogexpireunreachable::\n+gc.reflogExpireUnreachable::\n+gc.<ref>.reflogExpireUnreachable::\n \t'git reflog expire' removes reflog entries older than\n \tthis time and are not reachable from the current tip;\n \tdefaults to 30 days.  With \"<pattern>\" (e.g. \"refs/stash\")\n \tin the middle, the setting applies only to the refs that\n \tmatch the <pattern>.\n \n-gc.rerereresolved::\n+gc.rerereResolved::\n \tRecords of conflicted merge you resolved earlier are\n \tkept for this many days when 'git rerere gc' is run.\n \tThe default is 60 days.  See linkgit:git-rerere[1].\n \n-gc.rerereunresolved::\n+gc.rerereUnresolved::\n \tRecords of conflicted merge you have not resolved are\n \tkept for this many days when 'git rerere gc' is run.\n \tThe default is 15 days.  See linkgit:git-rerere[1].\n \n-gitcvs.commitmsgannotation::\n+gitcvs.commitMsgAnnotation::\n \tAppend this string to each commit message. Set to empty string\n \tto disable this feature. Defaults to \"via git-CVS emulator\".\n \n@@ -1281,7 +1281,7 @@ gitcvs.enabled::\n \tWhether the CVS server interface is enabled for this repository.\n \tSee linkgit:git-cvsserver[1].\n \n-gitcvs.logfile::\n+gitcvs.logFile::\n \tPath to a log file where the CVS server interface well... logs\n \tvarious stuff. See linkgit:git-cvsserver[1].\n \n@@ -1296,7 +1296,7 @@ gitcvs.usecrlfattr::\n \tthe file type to be determined, then 'gitcvs.allbinary' is\n \tused. See linkgit:gitattributes[5].\n \n-gitcvs.allbinary::\n+gitcvs.allBinary::\n \tThis is used if 'gitcvs.usecrlfattr' does not resolve\n \tthe correct '-kb' mode to use. If true, all\n \tunresolved files are sent to the client in\n@@ -1306,7 +1306,7 @@ gitcvs.allbinary::\n \tthen the contents of the file are examined to decide if\n \tit is binary, similar to 'core.autocrlf'.\n \n-gitcvs.dbname::\n+gitcvs.dbName::\n \tDatabase used by git-cvsserver to cache revision information\n \tderived from the Git repository. The exact meaning depends on the\n \tused database driver, for SQLite (which is the default driver) this\n@@ -1314,7 +1314,7 @@ gitcvs.dbname::\n \tlinkgit:git-cvsserver[1] for details). May not contain semicolons (`;`).\n \tDefault: '%Ggitcvs.%m.sqlite'\n \n-gitcvs.dbdriver::\n+gitcvs.dbDriver::\n \tUsed Perl DBI driver. You can specify any available driver\n \tfor this here, but it might not work. git-cvsserver is tested\n \twith 'DBD::SQLite', reported to work with 'DBD::Pg', and\n@@ -1322,7 +1322,7 @@ gitcvs.dbdriver::\n \tMay not contain double colons (`:`). Default: 'SQLite'.\n \tSee linkgit:git-cvsserver[1].\n \n-gitcvs.dbuser, gitcvs.dbpass::\n+gitcvs.dbUser, gitcvs.dbPass::\n \tDatabase user and password. Only useful if setting 'gitcvs.dbdriver',\n \tsince SQLite has no concept of database users and/or passwords.\n \t'gitcvs.dbuser' supports variable substitution (see\n@@ -1354,7 +1354,7 @@ gitweb.highlight::\n gitweb.patches::\n gitweb.pickaxe::\n gitweb.remote_heads::\n-gitweb.showsizes::\n+gitweb.showSizes::\n gitweb.snapshot::\n \tSee linkgit:gitweb.conf[5] for description.\n \n@@ -1383,15 +1383,15 @@ gpg.program::\n \tsigned, and the program is expected to send the result to its\n \tstandard output.\n \n-gui.commitmsgwidth::\n+gui.commitMsgWidth::\n \tDefines how wide the commit message window is in the\n \tlinkgit:git-gui[1]. \"75\" is the default.\n \n-gui.diffcontext::\n+gui.diffContext::\n \tSpecifies how many context lines should be used in calls to diff\n \tmade by the linkgit:git-gui[1]. The default is \"5\".\n \n-gui.displayuntracked::\n+gui.displayUntracked::\n \tDetermines if linkgit::git-gui[1] shows untracked files\n \tin the file list. The default is \"true\".\n \n@@ -1403,16 +1403,16 @@ gui.encoding::\n \tIf this option is not set, the tools default to the\n \tlocale encoding.\n \n-gui.matchtrackingbranch::\n+gui.matchTrackingBranch::\n \tDetermines if new branches created with linkgit:git-gui[1] should\n \tdefault to tracking remote branches with matching names or\n \tnot. Default: \"false\".\n \n-gui.newbranchtemplate::\n+gui.newBranchTemplate::\n \tIs used as suggested name when creating new branches using the\n \tlinkgit:git-gui[1].\n \n-gui.pruneduringfetch::\n+gui.pruneDuringFetch::\n \t\"true\" if linkgit:git-gui[1] should prune remote-tracking branches when\n \tperforming a fetch. The default value is \"false\".\n \n@@ -1420,17 +1420,17 @@ gui.trustmtime::\n \tDetermines if linkgit:git-gui[1] should trust the file modification\n \ttimestamp or not. By default the timestamps are not trusted.\n \n-gui.spellingdictionary::\n+gui.spellingDictionary::\n \tSpecifies the dictionary used for spell checking commit messages in\n \tthe linkgit:git-gui[1]. When set to \"none\" spell checking is turned\n \toff.\n \n-gui.fastcopyblame::\n+gui.fastCopyBlame::\n \tIf true, 'git gui blame' uses `-C` instead of `-C -C` for original\n \tlocation detection. It makes blame significantly faster on huge\n \trepositories at the expense of less thorough copy detection.\n \n-gui.copyblamethreshold::\n+gui.copyBlameThreshold::\n \tSpecifies the threshold to use in 'git gui blame' original location\n \tdetection, measured in alphanumeric characters. See the\n \tlinkgit:git-blame[1] manual for more information on copy detection.\n@@ -1450,22 +1450,22 @@ guitool.<name>.cmd::\n \t'FILENAME', and the name of the current branch as 'CUR_BRANCH' (if\n \tthe head is detached, 'CUR_BRANCH' is empty).\n \n-guitool.<name>.needsfile::\n+guitool.<name>.needsFile::\n \tRun the tool only if a diff is selected in the GUI. It guarantees\n \tthat 'FILENAME' is not empty.\n \n-guitool.<name>.noconsole::\n+guitool.<name>.noConsole::\n \tRun the command silently, without creating a window to display its\n \toutput.\n \n-guitool.<name>.norescan::\n+guitool.<name>.noRescan::\n \tDon't rescan the working directory for changes after the tool\n \tfinishes execution.\n \n guitool.<name>.confirm::\n \tShow a confirmation dialog before actually running the tool.\n \n-guitool.<name>.argprompt::\n+guitool.<name>.argPrompt::\n \tRequest a string argument from the user, and pass it to the tool\n \tthrough the 'ARGS' environment variable. Since requesting an\n \targument implies confirmation, the 'confirm' option has no effect\n@@ -1473,12 +1473,12 @@ guitool.<name>.argprompt::\n \tthe dialog uses a built-in generic prompt; otherwise the exact\n \tvalue of the variable is used.\n \n-guitool.<name>.revprompt::\n+guitool.<name>.revPrompt::\n \tRequest a single valid revision from the user, and set the\n \t'REVISION' environment variable. In other aspects this option\n \tis similar to 'argprompt', and can be used together with it.\n \n-guitool.<name>.revunmerged::\n+guitool.<name>.revUnmerged::\n \tShow only unmerged branches in the 'revprompt' subdialog.\n \tThis is useful for tools similar to merge or rebase, but not\n \tfor things like checkout or reset.\n@@ -1501,7 +1501,7 @@ help.format::\n \tValues 'man', 'info', 'web' and 'html' are supported. 'man' is\n \tthe default. 'web' and 'html' are the same.\n \n-help.autocorrect::\n+help.autoCorrect::\n \tAutomatically correct and execute mistyped commands after\n \twaiting for the given number of deciseconds (0.1 sec). If more\n \tthan one command can be deduced from the entered text, nothing\n@@ -1510,7 +1510,7 @@ help.autocorrect::\n \tvalue is 0 - the command will be just shown but not executed.\n \tThis is the default.\n \n-help.htmlpath::\n+help.htmlPath::\n \tSpecify the path where the HTML documentation resides. File system paths\n \tand URLs are supported. HTML pages will be prefixed with this path when\n \thelp is displayed in the 'web' format. This defaults to the documentation\n@@ -1522,7 +1522,7 @@ http.proxy::\n \t`curl(1)`).  This can be overridden on a per-remote basis; see\n \tremote.<name>.proxy\n \n-http.cookiefile::\n+http.cookieFile::\n \tFile containing previously stored cookie lines which should be used\n \tin the Git http session, if they match the server. The file format\n \tof the file to read cookies from should be plain HTTP headers or\n@@ -1530,7 +1530,7 @@ http.cookiefile::\n \tNOTE that the file specified with http.cookiefile is only used as\n \tinput unless http.saveCookies is set.\n \n-http.savecookies::\n+http.saveCookies::\n \tIf set, store cookies received during requests to the file specified by\n \thttp.cookiefile. Has no effect if http.cookiefile is unset.\n \n@@ -1603,7 +1603,7 @@ http.noEPSV::\n \tsupport EPSV mode. Can be overridden by the 'GIT_CURL_FTP_NO_EPSV'\n \tenvironment variable. Default is false (curl will use EPSV).\n \n-http.useragent::\n+http.userAgent::\n \tThe HTTP USER_AGENT string presented to an HTTP server.  The default\n \tvalue represents the version of the client Git such as git/1.7.1.\n \tThis option allows you to override this value to a more common value\n@@ -1676,7 +1676,7 @@ index.version::\n \tSpecify the version with which new index files should be\n \tinitialized.  This does not affect existing repositories.\n \n-init.templatedir::\n+init.templateDir::\n \tSpecify the directory from which templates will be copied.\n \t(See the \"TEMPLATE DIRECTORY\" section of linkgit:git-init[1].)\n \n@@ -1692,7 +1692,7 @@ instaweb.local::\n \tIf true the web server started by linkgit:git-instaweb[1] will\n \tbe bound to the local IP (127.0.0.1).\n \n-instaweb.modulepath::\n+instaweb.modulePath::\n \tThe default module path for linkgit:git-instaweb[1] to use\n \tinstead of /usr/lib/apache2/modules.  Only used if httpd\n \tis Apache.\n@@ -1701,7 +1701,7 @@ instaweb.port::\n \tThe port number to bind the gitweb httpd to. See\n \tlinkgit:git-instaweb[1].\n \n-interactive.singlekey::\n+interactive.singleKey::\n \tIn interactive commands, allow the user to provide one-letter\n \tinput with a single key (i.e., without hitting enter).\n \tCurrently this is used by the `--patch` mode of\n@@ -1729,7 +1729,7 @@ log.decorate::\n \tspecified, the full ref name (including prefix) will be printed.\n \tThis is the same as the log commands '--decorate' option.\n \n-log.showroot::\n+log.showRoot::\n \tIf true, the initial commit will be shown as a big creation event.\n \tThis is equivalent to a diff against an empty tree.\n \tTools like linkgit:git-log[1] or linkgit:git-whatchanged[1], which\n@@ -1966,7 +1966,7 @@ pack.useBitmaps::\n \ttrue. You should not generally need to turn this off unless\n \tyou are debugging pack bitmaps.\n \n-pack.writebitmaps (deprecated)::\n+pack.writeBitmaps (deprecated)::\n \tThis is a deprecated synonym for `repack.writeBitmaps`.\n \n pack.writeBitmapHashCache::\n@@ -2089,10 +2089,10 @@ rebase.stat::\n \tWhether to show a diffstat of what changed upstream since the last\n \trebase. False by default.\n \n-rebase.autosquash::\n+rebase.autoSquash::\n \tIf set to true enable '--autosquash' option by default.\n \n-rebase.autostash::\n+rebase.autoStash::\n \tWhen set to true, automatically create a temporary stash\n \tbefore the operation begins, and apply it after the operation\n \tends.  This means that you can run rebase on a dirty worktree.\n@@ -2100,7 +2100,7 @@ rebase.autostash::\n \tsuccessful rebase might result in non-trivial conflicts.\n \tDefaults to false.\n \n-receive.advertiseatomic::\n+receive.advertiseAtomic::\n \tBy default, git-receive-pack will advertise the atomic push\n \tcapability to its clients. If you don't want to this capability\n \tto be advertised, set this variable to false.\n@@ -2110,13 +2110,13 @@ receive.autogc::\n \treceiving data from git-push and updating refs.  You can stop\n \tit by setting this variable to false.\n \n-receive.certnonceseed::\n+receive.certNonceSeed::\n \tBy setting this variable to a string, `git receive-pack`\n \twill accept a `git push --signed` and verifies it by using\n \ta \"nonce\" protected by HMAC using this string as a secret\n \tkey.\n \n-receive.certnonceslop::\n+receive.certNonceSlop::\n \tWhen a `git push --signed` sent a push certificate with a\n \t\"nonce\" that was issued by a receive-pack serving the same\n \trepository within this many seconds, export the \"nonce\"\n@@ -2180,7 +2180,7 @@ receive.denyNonFastForwards::\n \teven if that push is forced. This configuration variable is\n \tset when initializing a shared repository.\n \n-receive.hiderefs::\n+receive.hideRefs::\n \tString(s) `receive-pack` uses to decide which refs to omit\n \tfrom its initial advertisement.  Use more than one\n \tdefinitions to specify multiple prefix strings. A ref that\n@@ -2189,15 +2189,15 @@ receive.hiderefs::\n \tpush`, and an attempt to update or delete a hidden ref by\n \t`git push` is rejected.\n \n-receive.updateserverinfo::\n+receive.updateServerInfo::\n \tIf set to true, git-receive-pack will run git-update-server-info\n \tafter receiving data from git-push and updating refs.\n \n-receive.shallowupdate::\n+receive.shallowUpdate::\n \tIf set to true, .git/shallow can be updated when new refs\n \trequire new shallow roots. Otherwise those refs are rejected.\n \n-remote.pushdefault::\n+remote.pushDefault::\n \tThe remote to push to by default.  Overrides\n \t`branch.<name>.remote` for all branches, and is overridden by\n \t`branch.<name>.pushremote` for specific branches.\n@@ -2244,7 +2244,7 @@ remote.<name>.uploadpack::\n \tThe default program to execute on the remote side when fetching.  See\n \toption \\--upload-pack of linkgit:git-fetch-pack[1].\n \n-remote.<name>.tagopt::\n+remote.<name>.tagOpt::\n \tSetting this value to \\--no-tags disables automatic tag following when\n \tfetching from remote <name>. Setting it to \\--tags will fetch every\n \ttag from remote <name>, even if they are not reachable from remote\n@@ -2266,7 +2266,7 @@ remotes.<group>::\n \tThe list of remotes which are fetched by \"git remote update\n \t<group>\".  See linkgit:git-remote[1].\n \n-repack.usedeltabaseoffset::\n+repack.useDeltaBaseOffset::\n \tBy default, linkgit:git-repack[1] creates packs that use\n \tdelta-base offset. If you need to share your repository with\n \tGit older than version 1.4.4, either directly or via a dumb\n@@ -2289,7 +2289,7 @@ repack.writeBitmaps::\n \tspace and extra time spent on the initial repack.  Defaults to\n \tfalse.\n \n-rerere.autoupdate::\n+rerere.autoUpdate::\n \tWhen set to true, `git-rerere` updates the index with the\n \tresulting contents after it cleanly resolves conflicts using\n \tpreviously recorded resolution.  Defaults to false.\n@@ -2308,7 +2308,7 @@ sendemail.identity::\n \tvalues in the 'sendemail' section. The default identity is\n \tthe value of 'sendemail.identity'.\n \n-sendemail.smtpencryption::\n+sendemail.smtpEncryption::\n \tSee linkgit:git-send-email[1] for description.  Note that this\n \tsetting is not subject to the 'identity' mechanism.\n \n@@ -2325,29 +2325,29 @@ sendemail.<identity>.*::\n \tidentity is selected, through command-line or\n \t'sendemail.identity'.\n \n-sendemail.aliasesfile::\n-sendemail.aliasfiletype::\n+sendemail.aliasesFile::\n+sendemail.aliasFileType::\n sendemail.annotate::\n sendemail.bcc::\n sendemail.cc::\n-sendemail.cccmd::\n-sendemail.chainreplyto::\n+sendemail.ccCmd::\n+sendemail.chainReplyTo::\n sendemail.confirm::\n-sendemail.envelopesender::\n+sendemail.envelopeSender::\n sendemail.from::\n-sendemail.multiedit::\n+sendemail.multiEdit::\n sendemail.signedoffbycc::\n-sendemail.smtppass::\n+sendemail.smtpPass::\n sendemail.suppresscc::\n-sendemail.suppressfrom::\n+sendemail.suppressFrom::\n sendemail.to::\n-sendemail.smtpdomain::\n-sendemail.smtpserver::\n-sendemail.smtpserverport::\n-sendemail.smtpserveroption::\n-sendemail.smtpuser::\n+sendemail.smtpDomain::\n+sendemail.smtpServer::\n+sendemail.smtpServerPort::\n+sendemail.smtpServerOption::\n+sendemail.smtpUser::\n sendemail.thread::\n-sendemail.transferencoding::\n+sendemail.transferEncoding::\n sendemail.validate::\n sendemail.xmailer::\n \tSee linkgit:git-send-email[1] for description.\n@@ -2399,7 +2399,7 @@ If this variable is not specified, it defaults to 'normal'.\n This variable can be overridden with the -u|--untracked-files option\n of linkgit:git-status[1] and linkgit:git-commit[1].\n \n-status.submodulesummary::\n+status.submoduleSummary::\n \tDefaults to false.\n \tIf this is set to a non zero number or true (identical to -1 or an\n \tunlimited number), the submodule summary will be enabled and a\n@@ -2474,7 +2474,7 @@ transfer.fsckObjects::\n \tnot set, the value of this variable is used instead.\n \tDefaults to false.\n \n-transfer.hiderefs::\n+transfer.hideRefs::\n \tThis variable can be used to set both `receive.hiderefs`\n \tand `uploadpack.hiderefs` at the same time to the same\n \tvalues.  See entries for these other variables.\n@@ -2491,7 +2491,7 @@ uploadarchive.allowUnreachable::\n \tlinkgit:git-upload-archive[1] for more details. Defaults to\n \t`false`.\n \n-uploadpack.hiderefs::\n+uploadpack.hideRefs::\n \tString(s) `upload-pack` uses to decide which refs to omit\n \tfrom its initial advertisement.  Use more than one\n \tdefinitions to specify multiple prefix strings. A ref that\n@@ -2506,7 +2506,7 @@ uploadpack.allowtipsha1inwant::\n \tof a hidden ref (by default, such a request is rejected).\n \tsee also `uploadpack.hiderefs`.\n \n-uploadpack.keepalive::\n+uploadpack.keepAlive::\n \tWhen `upload-pack` has started `pack-objects`, there may be a\n \tquiet period while `pack-objects` prepares the pack. Normally\n \tit would output progress information, but if `--quiet` was used\n@@ -2551,7 +2551,7 @@ user.name::\n \tCan be overridden by the 'GIT_AUTHOR_NAME' and 'GIT_COMMITTER_NAME'\n \tenvironment variables.  See linkgit:git-commit-tree[1].\n \n-user.signingkey::\n+user.signingKey::\n \tIf linkgit:git-tag[1] or linkgit:git-commit[1] is not selecting the\n \tkey you want it to automatically when creating a signed tag or\n \tcommit, you can override the default selection with this variable.\ndiff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt\nindex b001779..779f127 100644\n--- a/Documentation/diff-config.txt\n+++ b/Documentation/diff-config.txt\n@@ -1,4 +1,4 @@\n-diff.autorefreshindex::\n+diff.autoRefreshIndex::\n \tWhen using 'git diff' to compare with work tree\n \tfiles, do not consider stat-only change as changed.\n \tInstead, silently run `git update-index --refresh` to\n@@ -79,7 +79,7 @@ diff.ignoreSubmodules::\n \toverridden by using the --ignore-submodules command-line option.\n \tThe 'git submodule' commands are not affected by this setting.\n \n-diff.mnemonicprefix::\n+diff.mnemonicPrefix::\n \tIf set, 'git diff' uses a prefix pair that is different from the\n \tstandard \"a/\" and \"b/\" depending on what is being compared.  When\n \tthis configuration is in effect, reverse diff output also swaps\n@@ -98,7 +98,7 @@ diff.mnemonicprefix::\n diff.noprefix::\n \tIf set, 'git diff' does not show any source or destination prefix.\n \n-diff.orderfile::\n+diff.orderFile::\n \tFile indicating how to order files within a diff, using\n \tone shell glob pattern per line.\n \tCan be overridden by the '-O' option to linkgit:git-diff[1].\n@@ -148,7 +148,7 @@ diff.<driver>.textconv::\n \tconversion is used to generate a human-readable diff.  See\n \tlinkgit:gitattributes[5] for details.\n \n-diff.<driver>.wordregex::\n+diff.<driver>.wordRegex::\n \tThe regular expression that the diff driver should use to\n \tsplit words in a line.  See linkgit:gitattributes[5] for\n \tdetails.\ndiff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt\nindex d78d6d8..8a0e52f 100644\n--- a/Documentation/merge-config.txt\n+++ b/Documentation/merge-config.txt\n@@ -1,4 +1,4 @@\n-merge.conflictstyle::\n+merge.conflictStyle::\n \tSpecify the style in which conflicted hunks are written out to\n \tworking tree files upon merge.  The default is \"merge\", which\n \tshows a `<<<<<<<` conflict marker, changes made by one side,\n-- \n2.3.0.rc1.137.g477eb31\n"},{"id":"257567","messageId":"20150311203245.GA20243@flurp.local","threadId":"38771","inReplyTo":"1426076418-13741-1-git-send-email-pclouds@gmail.com","subject":"Re: [PATCH v2] *config.txt: stick to camelCase naming convention","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2015-03-11T20:32:45Z","receivedAt":"2015-03-11T20:32:45Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Wed, Mar 11, 2015 at 07:20:18PM +0700, Nguyễn Thái Ngọc Duy wrote:\n> This should improve readability. Compare \"thislongname\" and\n> \"thisLongName\". The following keys are left in unchanged. We can\n> decide what to do with them later.\n> \n>  - am.keepcr\n>  - core.autocrlf .safecrlf .trustctime\n>  - diff.dirstat .noprefix\n>  - gitcvs.usecrlfattr\n>  - gui.blamehistoryctx .trustmtime\n>  - pull.twohead\n>  - receive.autogc\n>  - sendemail.signedoffbycc .smtpsslcertpath .suppresscc\n> \n> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\n> ---\n> diff --git a/Documentation/config.txt b/Documentation/config.txt\n> index 1530255..54ae0f6 100644\n> --- a/Documentation/config.txt\n> +++ b/Documentation/config.txt\n> @@ -237,7 +237,7 @@ The default is false, except linkgit:git-clone[1] or linkgit:git-init[1]\n>  will probe and set core.ignorecase true if appropriate when the repository\n>  is created.\n>  \n> -core.precomposeunicode::\n> +core.precomposeUnicode::\n\nThere are numerous places in config.txt where a config variable is\nmentioned in the description blurbs as well, so camel-casing it at just\nthe point of definition makes for an incomplete conversion.\n\n>  \tThis option is only used by Mac OS implementation of Git.\n>  \tWhen core.precomposeunicode=true, Git reverts the unicode decomposition\n\nHere is one such instance of the variable mentioned inline in a blurb.\n\nThese converted variables are also mentioned in a number of other\ndocumentation files. Below is a more thorough conversion, covering all\ninstances. You may want to split it up for easier review.\n\n\n--- 8< ---\nFrom: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= <pclouds@gmail.com>\nSubject: [PATCH] *config.txt: stick to camelCase naming convention\n\nThis should improve readability. Compare \"thislongname\" and\n\"thisLongName\". The following keys are left in unchanged. We can\ndecide what to do with them later.\n\n - am.keepcr\n - core.autocrlf .safecrlf .trustctime\n - diff.dirstat .noprefix\n - gitcvs.usecrlfattr\n - gui.blamehistoryctx .trustmtime\n - pull.twohead\n - receive.autogc\n - sendemail.signedoffbycc .smtpsslcertpath .suppresscc\n\nHelped-by: Eric Sunshine <sunshine@sunshineco.com>\nSigned-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\nSigned-off-by: Eric Sunshine <sunshine@sunshineco.com>\n---\n Documentation/CodingGuidelines     |   2 +-\n Documentation/blame-options.txt    |   2 +-\n Documentation/config.txt           | 242 ++++++++++++++++++-------------------\n Documentation/diff-config.txt      |  10 +-\n Documentation/diff-options.txt     |   4 +-\n Documentation/fetch-options.txt    |   2 +-\n Documentation/git-add.txt          |   4 +-\n Documentation/git-apply.txt        |   2 +-\n Documentation/git-branch.txt       |   6 +-\n Documentation/git-check-ignore.txt |   2 +-\n Documentation/git-checkout.txt     |   4 +-\n Documentation/git-commit-tree.txt  |   2 +-\n Documentation/git-commit.txt       |   2 +-\n Documentation/git-config.txt       |   2 +-\n Documentation/git-cvsserver.txt    |  22 ++--\n Documentation/git-fetch.txt        |   2 +-\n Documentation/git-format-patch.txt |   4 +-\n Documentation/git-gc.txt           |  12 +-\n Documentation/git-init.txt         |   2 +-\n Documentation/git-instaweb.txt     |   2 +-\n Documentation/git-log.txt          |   2 +-\n Documentation/git-merge.txt        |   4 +-\n Documentation/git-pull.txt         |   2 +-\n Documentation/git-rebase.txt       |   6 +-\n Documentation/git-receive-pack.txt |   2 +-\n Documentation/git-repack.txt       |   4 +-\n Documentation/git-rerere.txt       |   2 +-\n Documentation/git-send-email.txt   |  50 ++++----\n Documentation/git-status.txt       |   4 +-\n Documentation/git-tag.txt          |   2 +-\n Documentation/git.txt              |   2 +-\n Documentation/gitattributes.txt    |   2 +-\n Documentation/gitcredentials.txt   |   2 +-\n Documentation/gitignore.txt        |   4 +-\n Documentation/gitweb.conf.txt      |   2 +-\n Documentation/merge-config.txt     |   2 +-\n Documentation/user-manual.txt      |   2 +-\n 37 files changed, 212 insertions(+), 212 deletions(-)\n\ndiff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines\nindex 7636199..376d5ec 100644\n--- a/Documentation/CodingGuidelines\n+++ b/Documentation/CodingGuidelines\n@@ -526,7 +526,7 @@ Writing Documentation:\n  `backticks around word phrases`, do so.\n    `--pretty=oneline`\n    `git rev-list`\n-   `remote.pushdefault`\n+   `remote.pushDefault`\n \n  Word phrases enclosed in `backtick characters` are rendered literally\n  and will not be further expanded. The use of `backticks` to achieve the\ndiff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt\nindex 0cebc4f..b299b59 100644\n--- a/Documentation/blame-options.txt\n+++ b/Documentation/blame-options.txt\n@@ -4,7 +4,7 @@\n \n --root::\n \tDo not treat root commits as boundaries.  This can also be\n-\tcontrolled via the `blame.showroot` config option.\n+\tcontrolled via the `blame.showRoot` config option.\n \n --show-stats::\n \tInclude additional statistics at the end of blame output.\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 1530255..d4ca046 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -225,7 +225,7 @@ See linkgit:git-update-index[1].\n +\n The default is true (when core.filemode is not specified in the config file).\n \n-core.ignorecase::\n+core.ignoreCase::\n \tIf true, this option enables various workarounds to enable\n \tGit to work better on filesystems that are not case sensitive,\n \tlike FAT. For example, if a directory listing finds\n@@ -234,12 +234,12 @@ core.ignorecase::\n \t\"Makefile\".\n +\n The default is false, except linkgit:git-clone[1] or linkgit:git-init[1]\n-will probe and set core.ignorecase true if appropriate when the repository\n+will probe and set core.ignoreCase true if appropriate when the repository\n is created.\n \n-core.precomposeunicode::\n+core.precomposeUnicode::\n \tThis option is only used by Mac OS implementation of Git.\n-\tWhen core.precomposeunicode=true, Git reverts the unicode decomposition\n+\tWhen core.precomposeUnicode=true, Git reverts the unicode decomposition\n \tof filenames done by Mac OS. This is useful when sharing a repository\n \tbetween Mac OS and Linux or Windows.\n \t(Git for Windows 1.7.10 or higher is needed, or Git under cygwin 1.7).\n@@ -264,13 +264,13 @@ core.trustctime::\n \tcrawlers and some backup systems).\n \tSee linkgit:git-update-index[1]. True by default.\n \n-core.checkstat::\n+core.checkStat::\n \tDetermines which stat fields to match between the index\n \tand work tree. The user can set this to 'default' or\n \t'minimal'. Default (or explicitly 'default'), is to check\n \tall fields, including the sub-second part of mtime and ctime.\n \n-core.quotepath::\n+core.quotePath::\n \tThe commands that output paths (e.g. 'ls-files',\n \t'diff'), when not given the `-z` option, will quote\n \t\"unusual\" characters in the pathname by enclosing the\n@@ -474,9 +474,9 @@ core.compression::\n \t-1 is the zlib default. 0 means no compression,\n \tand 1..9 are various speed/size tradeoffs, 9 being slowest.\n \tIf set, this provides a default to other compression variables,\n-\tsuch as 'core.loosecompression' and 'pack.compression'.\n+\tsuch as 'core.looseCompression' and 'pack.compression'.\n \n-core.loosecompression::\n+core.looseCompression::\n \tAn integer -1..9, indicating the compression level for objects that\n \tare not in a pack file. -1 is the zlib default. 0 means no\n \tcompression, and 1..9 are various speed/size tradeoffs, 9 being\n@@ -537,7 +537,7 @@ be delta compressed, but larger binary media files won't be.\n +\n Common unit suffixes of 'k', 'm', or 'g' are supported.\n \n-core.excludesfile::\n+core.excludesFile::\n \tIn addition to '.gitignore' (per-directory) and\n \t'.git/info/exclude', Git looks into this file for patterns\n \tof files which are not meant to be tracked.  \"`~/`\" is expanded\n@@ -546,7 +546,7 @@ core.excludesfile::\n \tIf $XDG_CONFIG_HOME is either not set or empty, $HOME/.config/git/ignore\n \tis used instead. See linkgit:gitignore[5].\n \n-core.askpass::\n+core.askPass::\n \tSome commands (e.g. svn and http interfaces) that interactively\n \task for a password can be told to use an external program given\n \tvia the value of this variable. Can be overridden by the 'GIT_ASKPASS'\n@@ -555,11 +555,11 @@ core.askpass::\n \tprompt. The external program shall be given a suitable prompt as\n \tcommand-line argument and write the password on its STDOUT.\n \n-core.attributesfile::\n+core.attributesFile::\n \tIn addition to '.gitattributes' (per-directory) and\n \t'.git/info/attributes', Git looks into this file for attributes\n \t(see linkgit:gitattributes[5]). Path expansions are made the same\n-\tway as for `core.excludesfile`. Its default value is\n+\tway as for `core.excludesFile`. Its default value is\n \t$XDG_CONFIG_HOME/git/attributes. If $XDG_CONFIG_HOME is either not\n \tset or empty, $HOME/.config/git/attributes is used instead.\n \n@@ -569,7 +569,7 @@ core.editor::\n \tvariable when it is set, and the environment variable\n \t`GIT_EDITOR` is not set.  See linkgit:git-var[1].\n \n-core.commentchar::\n+core.commentChar::\n \tCommands such as `commit` and `tag` that lets you edit\n \tmessages consider a line that begins with this character\n \tcommented, and removes them after the editor returns\n@@ -638,7 +638,7 @@ core.whitespace::\n   is relevant for `indent-with-non-tab` and when Git fixes `tab-in-indent`\n   errors. The default tab width is 8. Allowed values are 1 to 63.\n \n-core.fsyncobjectfiles::\n+core.fsyncObjectFiles::\n \tThis boolean will enable 'fsync()' when writing object files.\n +\n This is a total waste of time and effort on a filesystem that orders\n@@ -646,7 +646,7 @@ data writes properly, but can be useful for filesystems that do not use\n journalling (traditional UNIX filesystems) or that only journal metadata\n and not file contents (OS X's HFS+, or Linux ext3 with \"data=writeback\").\n \n-core.preloadindex::\n+core.preloadIndex::\n \tEnable parallel index preload for operations like 'git diff'\n +\n This can speed up operations like 'git diff' and 'git status' especially\n@@ -717,7 +717,7 @@ am.keepcr::\n \tby giving '--no-keep-cr' from the command line.\n \tSee linkgit:git-am[1], linkgit:git-mailsplit[1].\n \n-apply.ignorewhitespace::\n+apply.ignoreWhitespace::\n \tWhen set to 'change', tells 'git apply' to ignore changes in\n \twhitespace, in the same way as the '--ignore-space-change'\n \toption.\n@@ -729,7 +729,7 @@ apply.whitespace::\n \tTells 'git apply' how to handle whitespaces, in the same way\n \tas the '--whitespace' option. See linkgit:git-apply[1].\n \n-branch.autosetupmerge::\n+branch.autoSetupMerge::\n \tTells 'git branch' and 'git checkout' to set up new branches\n \tso that linkgit:git-pull[1] will appropriately merge from the\n \tstarting point branch. Note that even if this option is not set,\n@@ -741,7 +741,7 @@ branch.autosetupmerge::\n \tlocal branch or remote-tracking\n \tbranch. This option defaults to true.\n \n-branch.autosetuprebase::\n+branch.autoSetupRebase::\n \tWhen a new branch is created with 'git branch' or 'git checkout'\n \tthat tracks another branch, this variable tells Git to set\n \tup pull to rebase instead of merge (see \"branch.<name>.rebase\").\n@@ -752,27 +752,27 @@ branch.autosetuprebase::\n \tremote-tracking branches.\n \tWhen `always`, rebase will be set to true for all tracking\n \tbranches.\n-\tSee \"branch.autosetupmerge\" for details on how to set up a\n+\tSee \"branch.autoSetupMerge\" for details on how to set up a\n \tbranch to track another branch.\n \tThis option defaults to never.\n \n branch.<name>.remote::\n \tWhen on branch <name>, it tells 'git fetch' and 'git push'\n \twhich remote to fetch from/push to.  The remote to push to\n-\tmay be overridden with `remote.pushdefault` (for all branches).\n+\tmay be overridden with `remote.pushDefault` (for all branches).\n \tThe remote to push to, for the current branch, may be further\n-\toverridden by `branch.<name>.pushremote`.  If no remote is\n+\toverridden by `branch.<name>.pushRemote`.  If no remote is\n \tconfigured, or if you are not on any branch, it defaults to\n-\t`origin` for fetching and `remote.pushdefault` for pushing.\n+\t`origin` for fetching and `remote.pushDefault` for pushing.\n \tAdditionally, `.` (a period) is the current local repository\n \t(a dot-repository), see `branch.<name>.merge`'s final note below.\n \n-branch.<name>.pushremote::\n+branch.<name>.pushRemote::\n \tWhen on branch <name>, it overrides `branch.<name>.remote` for\n-\tpushing.  It also overrides `remote.pushdefault` for pushing\n+\tpushing.  It also overrides `remote.pushDefault` for pushing\n \tfrom branch <name>.  When you pull from one place (e.g. your\n \tupstream) and push to another place (e.g. your own publishing\n-\trepository), you would want to set `remote.pushdefault` to\n+\trepository), you would want to set `remote.pushDefault` to\n \tspecify the remote to push to for all branches, and use this\n \toption to override it for a specific branch.\n \n@@ -794,7 +794,7 @@ branch.<name>.merge::\n \tbranch.<name>.merge to the desired branch, and use the relative path\n \tsetting `.` (a period) for branch.<name>.remote.\n \n-branch.<name>.mergeoptions::\n+branch.<name>.mergeOptions::\n \tSets default options for merging into branch <name>. The syntax and\n \tsupported options are the same as those of linkgit:git-merge[1], but\n \toption values containing whitespace characters are currently not\n@@ -938,7 +938,7 @@ color.pager::\n \tA boolean to enable/disable colored output when the pager is in\n \tuse (default is true).\n \n-color.showbranch::\n+color.showBranch::\n \tA boolean to enable/disable color in the output of\n \tlinkgit:git-show-branch[1]. May be set to `always`,\n \t`false` (or `never`) or `auto` (or `true`), in which case colors are used\n@@ -1038,7 +1038,7 @@ commit.cleanup::\n \thave to remove the help lines that begin with `#` in the commit log\n \ttemplate yourself, if you do this).\n \n-commit.gpgsign::\n+commit.gpgSign::\n \n \tA boolean to specify whether all commits should be GPG signed.\n \tUse of this option when doing operations such as rebase can\n@@ -1151,7 +1151,7 @@ format.cc::\n \tby mail.  See the --to and --cc options in\n \tlinkgit:git-format-patch[1].\n \n-format.subjectprefix::\n+format.subjectPrefix::\n \tThe default for format-patch is to output files with the '[PATCH]'\n \tsubject prefix. Use this variable to change that prefix.\n \n@@ -1161,7 +1161,7 @@ format.signature::\n \tSet this variable to the empty string (\"\") to suppress\n \tsignature generation.\n \n-format.signaturefile::\n+format.signatureFile::\n \tWorks just like format.signature except the contents of the\n \tfile specified by this variable will be used as the signature.\n \n@@ -1185,7 +1185,7 @@ format.thread::\n \tA true boolean value is the same as `shallow`, and a false\n \tvalue disables threading.\n \n-format.signoff::\n+format.signOff::\n \tA boolean value which lets you enable the `-s/--signoff` option of\n \tformat-patch by default. *Note:* Adding the Signed-off-by: line to a\n \tpatch should be a conscious act and means that you certify you have\n@@ -1224,17 +1224,17 @@ gc.auto::\n \tlight-weight garbage collection from time to time.  The\n \tdefault value is 6700.  Setting this to 0 disables it.\n \n-gc.autopacklimit::\n+gc.autoPackLimit::\n \tWhen there are more than this many packs that are not\n \tmarked with `*.keep` file in the repository, `git gc\n \t--auto` consolidates them into one larger pack.  The\n \tdefault\tvalue is 50.  Setting this to 0 disables it.\n \n-gc.autodetach::\n+gc.autoDetach::\n \tMake `git gc --auto` return immediately and run in background\n \tif the system supports it. Default is true.\n \n-gc.packrefs::\n+gc.packRefs::\n \tRunning `git pack-refs` in a repository renders it\n \tunclonable by Git versions prior to 1.5.1.2 over dumb\n \ttransports such as HTTP.  This variable determines whether\n@@ -1242,38 +1242,38 @@ gc.packrefs::\n \tto enable it within all non-bare repos or it can be set to a\n \tboolean value.  The default is `true`.\n \n-gc.pruneexpire::\n+gc.pruneExpire::\n \tWhen 'git gc' is run, it will call 'prune --expire 2.weeks.ago'.\n \tOverride the grace period with this config variable.  The value\n \t\"now\" may be used to disable this  grace period and always prune\n \tunreachable objects immediately.\n \n-gc.reflogexpire::\n-gc.<pattern>.reflogexpire::\n+gc.reflogExpire::\n+gc.<pattern>.reflogExpire::\n \t'git reflog expire' removes reflog entries older than\n \tthis time; defaults to 90 days.  With \"<pattern>\" (e.g.\n \t\"refs/stash\") in the middle the setting applies only to\n \tthe refs that match the <pattern>.\n \n-gc.reflogexpireunreachable::\n-gc.<ref>.reflogexpireunreachable::\n+gc.reflogExpireUnreachable::\n+gc.<ref>.reflogExpireUnreachable::\n \t'git reflog expire' removes reflog entries older than\n \tthis time and are not reachable from the current tip;\n \tdefaults to 30 days.  With \"<pattern>\" (e.g. \"refs/stash\")\n \tin the middle, the setting applies only to the refs that\n \tmatch the <pattern>.\n \n-gc.rerereresolved::\n+gc.rerereResolved::\n \tRecords of conflicted merge you resolved earlier are\n \tkept for this many days when 'git rerere gc' is run.\n \tThe default is 60 days.  See linkgit:git-rerere[1].\n \n-gc.rerereunresolved::\n+gc.rerereUnresolved::\n \tRecords of conflicted merge you have not resolved are\n \tkept for this many days when 'git rerere gc' is run.\n \tThe default is 15 days.  See linkgit:git-rerere[1].\n \n-gitcvs.commitmsgannotation::\n+gitcvs.commitMsgAnnotation::\n \tAppend this string to each commit message. Set to empty string\n \tto disable this feature. Defaults to \"via git-CVS emulator\".\n \n@@ -1281,7 +1281,7 @@ gitcvs.enabled::\n \tWhether the CVS server interface is enabled for this repository.\n \tSee linkgit:git-cvsserver[1].\n \n-gitcvs.logfile::\n+gitcvs.logFile::\n \tPath to a log file where the CVS server interface well... logs\n \tvarious stuff. See linkgit:git-cvsserver[1].\n \n@@ -1293,10 +1293,10 @@ gitcvs.usecrlfattr::\n \ttreat it as text. If they suppress text conversion, the file\n \twill be set with '-kb' mode, which suppresses any newline munging\n \tthe client might otherwise do. If the attributes do not allow\n-\tthe file type to be determined, then 'gitcvs.allbinary' is\n+\tthe file type to be determined, then 'gitcvs.allBinary' is\n \tused. See linkgit:gitattributes[5].\n \n-gitcvs.allbinary::\n+gitcvs.allBinary::\n \tThis is used if 'gitcvs.usecrlfattr' does not resolve\n \tthe correct '-kb' mode to use. If true, all\n \tunresolved files are sent to the client in\n@@ -1306,7 +1306,7 @@ gitcvs.allbinary::\n \tthen the contents of the file are examined to decide if\n \tit is binary, similar to 'core.autocrlf'.\n \n-gitcvs.dbname::\n+gitcvs.dbName::\n \tDatabase used by git-cvsserver to cache revision information\n \tderived from the Git repository. The exact meaning depends on the\n \tused database driver, for SQLite (which is the default driver) this\n@@ -1314,7 +1314,7 @@ gitcvs.dbname::\n \tlinkgit:git-cvsserver[1] for details). May not contain semicolons (`;`).\n \tDefault: '%Ggitcvs.%m.sqlite'\n \n-gitcvs.dbdriver::\n+gitcvs.dbDriver::\n \tUsed Perl DBI driver. You can specify any available driver\n \tfor this here, but it might not work. git-cvsserver is tested\n \twith 'DBD::SQLite', reported to work with 'DBD::Pg', and\n@@ -1322,10 +1322,10 @@ gitcvs.dbdriver::\n \tMay not contain double colons (`:`). Default: 'SQLite'.\n \tSee linkgit:git-cvsserver[1].\n \n-gitcvs.dbuser, gitcvs.dbpass::\n-\tDatabase user and password. Only useful if setting 'gitcvs.dbdriver',\n+gitcvs.dbUser, gitcvs.dbPass::\n+\tDatabase user and password. Only useful if setting 'gitcvs.dbDriver',\n \tsince SQLite has no concept of database users and/or passwords.\n-\t'gitcvs.dbuser' supports variable substitution (see\n+\t'gitcvs.dbUser' supports variable substitution (see\n \tlinkgit:git-cvsserver[1] for details).\n \n gitcvs.dbTableNamePrefix::\n@@ -1336,7 +1336,7 @@ gitcvs.dbTableNamePrefix::\n \tcharacters will be replaced with underscores.\n \n All gitcvs variables except for 'gitcvs.usecrlfattr' and\n-'gitcvs.allbinary' can also be specified as\n+'gitcvs.allBinary' can also be specified as\n 'gitcvs.<access_method>.<varname>' (where 'access_method'\n is one of \"ext\" and \"pserver\") to make them apply only for the given\n access method.\n@@ -1354,7 +1354,7 @@ gitweb.highlight::\n gitweb.patches::\n gitweb.pickaxe::\n gitweb.remote_heads::\n-gitweb.showsizes::\n+gitweb.showSizes::\n gitweb.snapshot::\n \tSee linkgit:gitweb.conf[5] for description.\n \n@@ -1383,15 +1383,15 @@ gpg.program::\n \tsigned, and the program is expected to send the result to its\n \tstandard output.\n \n-gui.commitmsgwidth::\n+gui.commitMsgWidth::\n \tDefines how wide the commit message window is in the\n \tlinkgit:git-gui[1]. \"75\" is the default.\n \n-gui.diffcontext::\n+gui.diffContext::\n \tSpecifies how many context lines should be used in calls to diff\n \tmade by the linkgit:git-gui[1]. The default is \"5\".\n \n-gui.displayuntracked::\n+gui.displayUntracked::\n \tDetermines if linkgit::git-gui[1] shows untracked files\n \tin the file list. The default is \"true\".\n \n@@ -1403,16 +1403,16 @@ gui.encoding::\n \tIf this option is not set, the tools default to the\n \tlocale encoding.\n \n-gui.matchtrackingbranch::\n+gui.matchTrackingBranch::\n \tDetermines if new branches created with linkgit:git-gui[1] should\n \tdefault to tracking remote branches with matching names or\n \tnot. Default: \"false\".\n \n-gui.newbranchtemplate::\n+gui.newBranchTemplate::\n \tIs used as suggested name when creating new branches using the\n \tlinkgit:git-gui[1].\n \n-gui.pruneduringfetch::\n+gui.pruneDuringFetch::\n \t\"true\" if linkgit:git-gui[1] should prune remote-tracking branches when\n \tperforming a fetch. The default value is \"false\".\n \n@@ -1420,17 +1420,17 @@ gui.trustmtime::\n \tDetermines if linkgit:git-gui[1] should trust the file modification\n \ttimestamp or not. By default the timestamps are not trusted.\n \n-gui.spellingdictionary::\n+gui.spellingDictionary::\n \tSpecifies the dictionary used for spell checking commit messages in\n \tthe linkgit:git-gui[1]. When set to \"none\" spell checking is turned\n \toff.\n \n-gui.fastcopyblame::\n+gui.fastCopyBlame::\n \tIf true, 'git gui blame' uses `-C` instead of `-C -C` for original\n \tlocation detection. It makes blame significantly faster on huge\n \trepositories at the expense of less thorough copy detection.\n \n-gui.copyblamethreshold::\n+gui.copyBlameThreshold::\n \tSpecifies the threshold to use in 'git gui blame' original location\n \tdetection, measured in alphanumeric characters. See the\n \tlinkgit:git-blame[1] manual for more information on copy detection.\n@@ -1450,22 +1450,22 @@ guitool.<name>.cmd::\n \t'FILENAME', and the name of the current branch as 'CUR_BRANCH' (if\n \tthe head is detached, 'CUR_BRANCH' is empty).\n \n-guitool.<name>.needsfile::\n+guitool.<name>.needsFile::\n \tRun the tool only if a diff is selected in the GUI. It guarantees\n \tthat 'FILENAME' is not empty.\n \n-guitool.<name>.noconsole::\n+guitool.<name>.noConsole::\n \tRun the command silently, without creating a window to display its\n \toutput.\n \n-guitool.<name>.norescan::\n+guitool.<name>.noRescan::\n \tDon't rescan the working directory for changes after the tool\n \tfinishes execution.\n \n guitool.<name>.confirm::\n \tShow a confirmation dialog before actually running the tool.\n \n-guitool.<name>.argprompt::\n+guitool.<name>.argPrompt::\n \tRequest a string argument from the user, and pass it to the tool\n \tthrough the 'ARGS' environment variable. Since requesting an\n \targument implies confirmation, the 'confirm' option has no effect\n@@ -1473,13 +1473,13 @@ guitool.<name>.argprompt::\n \tthe dialog uses a built-in generic prompt; otherwise the exact\n \tvalue of the variable is used.\n \n-guitool.<name>.revprompt::\n+guitool.<name>.revPrompt::\n \tRequest a single valid revision from the user, and set the\n \t'REVISION' environment variable. In other aspects this option\n-\tis similar to 'argprompt', and can be used together with it.\n+\tis similar to 'argPrompt', and can be used together with it.\n \n-guitool.<name>.revunmerged::\n-\tShow only unmerged branches in the 'revprompt' subdialog.\n+guitool.<name>.revUnmerged::\n+\tShow only unmerged branches in the 'revPrompt' subdialog.\n \tThis is useful for tools similar to merge or rebase, but not\n \tfor things like checkout or reset.\n \n@@ -1489,7 +1489,7 @@ guitool.<name>.title::\n \n guitool.<name>.prompt::\n \tSpecifies the general prompt string to display at the top of\n-\tthe dialog, before subsections for 'argprompt' and 'revprompt'.\n+\tthe dialog, before subsections for 'argPrompt' and 'revPrompt'.\n \tThe default value includes the actual command.\n \n help.browser::\n@@ -1501,7 +1501,7 @@ help.format::\n \tValues 'man', 'info', 'web' and 'html' are supported. 'man' is\n \tthe default. 'web' and 'html' are the same.\n \n-help.autocorrect::\n+help.autoCorrect::\n \tAutomatically correct and execute mistyped commands after\n \twaiting for the given number of deciseconds (0.1 sec). If more\n \tthan one command can be deduced from the entered text, nothing\n@@ -1510,7 +1510,7 @@ help.autocorrect::\n \tvalue is 0 - the command will be just shown but not executed.\n \tThis is the default.\n \n-help.htmlpath::\n+help.htmlPath::\n \tSpecify the path where the HTML documentation resides. File system paths\n \tand URLs are supported. HTML pages will be prefixed with this path when\n \thelp is displayed in the 'web' format. This defaults to the documentation\n@@ -1522,17 +1522,17 @@ http.proxy::\n \t`curl(1)`).  This can be overridden on a per-remote basis; see\n \tremote.<name>.proxy\n \n-http.cookiefile::\n+http.cookieFile::\n \tFile containing previously stored cookie lines which should be used\n \tin the Git http session, if they match the server. The file format\n \tof the file to read cookies from should be plain HTTP headers or\n \tthe Netscape/Mozilla cookie file format (see linkgit:curl[1]).\n-\tNOTE that the file specified with http.cookiefile is only used as\n+\tNOTE that the file specified with http.cookieFile is only used as\n \tinput unless http.saveCookies is set.\n \n-http.savecookies::\n+http.saveCookies::\n \tIf set, store cookies received during requests to the file specified by\n-\thttp.cookiefile. Has no effect if http.cookiefile is unset.\n+\thttp.cookieFile. Has no effect if http.cookieFile is unset.\n \n http.sslVerify::\n \tWhether to verify the SSL certificate when fetching or pushing\n@@ -1603,7 +1603,7 @@ http.noEPSV::\n \tsupport EPSV mode. Can be overridden by the 'GIT_CURL_FTP_NO_EPSV'\n \tenvironment variable. Default is false (curl will use EPSV).\n \n-http.useragent::\n+http.userAgent::\n \tThe HTTP USER_AGENT string presented to an HTTP server.  The default\n \tvalue represents the version of the client Git such as git/1.7.1.\n \tThis option allows you to override this value to a more common value\n@@ -1676,7 +1676,7 @@ index.version::\n \tSpecify the version with which new index files should be\n \tinitialized.  This does not affect existing repositories.\n \n-init.templatedir::\n+init.templateDir::\n \tSpecify the directory from which templates will be copied.\n \t(See the \"TEMPLATE DIRECTORY\" section of linkgit:git-init[1].)\n \n@@ -1692,7 +1692,7 @@ instaweb.local::\n \tIf true the web server started by linkgit:git-instaweb[1] will\n \tbe bound to the local IP (127.0.0.1).\n \n-instaweb.modulepath::\n+instaweb.modulePath::\n \tThe default module path for linkgit:git-instaweb[1] to use\n \tinstead of /usr/lib/apache2/modules.  Only used if httpd\n \tis Apache.\n@@ -1701,7 +1701,7 @@ instaweb.port::\n \tThe port number to bind the gitweb httpd to. See\n \tlinkgit:git-instaweb[1].\n \n-interactive.singlekey::\n+interactive.singleKey::\n \tIn interactive commands, allow the user to provide one-letter\n \tinput with a single key (i.e., without hitting enter).\n \tCurrently this is used by the `--patch` mode of\n@@ -1729,7 +1729,7 @@ log.decorate::\n \tspecified, the full ref name (including prefix) will be printed.\n \tThis is the same as the log commands '--decorate' option.\n \n-log.showroot::\n+log.showRoot::\n \tIf true, the initial commit will be shown as a big creation event.\n \tThis is equivalent to a diff against an empty tree.\n \tTools like linkgit:git-log[1] or linkgit:git-whatchanged[1], which\n@@ -1966,7 +1966,7 @@ pack.useBitmaps::\n \ttrue. You should not generally need to turn this off unless\n \tyou are debugging pack bitmaps.\n \n-pack.writebitmaps (deprecated)::\n+pack.writeBitmaps (deprecated)::\n \tThis is a deprecated synonym for `repack.writeBitmaps`.\n \n pack.writeBitmapHashCache::\n@@ -2089,10 +2089,10 @@ rebase.stat::\n \tWhether to show a diffstat of what changed upstream since the last\n \trebase. False by default.\n \n-rebase.autosquash::\n+rebase.autoSquash::\n \tIf set to true enable '--autosquash' option by default.\n \n-rebase.autostash::\n+rebase.autoStash::\n \tWhen set to true, automatically create a temporary stash\n \tbefore the operation begins, and apply it after the operation\n \tends.  This means that you can run rebase on a dirty worktree.\n@@ -2100,7 +2100,7 @@ rebase.autostash::\n \tsuccessful rebase might result in non-trivial conflicts.\n \tDefaults to false.\n \n-receive.advertiseatomic::\n+receive.advertiseAtomic::\n \tBy default, git-receive-pack will advertise the atomic push\n \tcapability to its clients. If you don't want to this capability\n \tto be advertised, set this variable to false.\n@@ -2110,13 +2110,13 @@ receive.autogc::\n \treceiving data from git-push and updating refs.  You can stop\n \tit by setting this variable to false.\n \n-receive.certnonceseed::\n+receive.certNonceSeed::\n \tBy setting this variable to a string, `git receive-pack`\n \twill accept a `git push --signed` and verifies it by using\n \ta \"nonce\" protected by HMAC using this string as a secret\n \tkey.\n \n-receive.certnonceslop::\n+receive.certNonceSlop::\n \tWhen a `git push --signed` sent a push certificate with a\n \t\"nonce\" that was issued by a receive-pack serving the same\n \trepository within this many seconds, export the \"nonce\"\n@@ -2180,7 +2180,7 @@ receive.denyNonFastForwards::\n \teven if that push is forced. This configuration variable is\n \tset when initializing a shared repository.\n \n-receive.hiderefs::\n+receive.hideRefs::\n \tString(s) `receive-pack` uses to decide which refs to omit\n \tfrom its initial advertisement.  Use more than one\n \tdefinitions to specify multiple prefix strings. A ref that\n@@ -2189,18 +2189,18 @@ receive.hiderefs::\n \tpush`, and an attempt to update or delete a hidden ref by\n \t`git push` is rejected.\n \n-receive.updateserverinfo::\n+receive.updateServerInfo::\n \tIf set to true, git-receive-pack will run git-update-server-info\n \tafter receiving data from git-push and updating refs.\n \n-receive.shallowupdate::\n+receive.shallowUpdate::\n \tIf set to true, .git/shallow can be updated when new refs\n \trequire new shallow roots. Otherwise those refs are rejected.\n \n-remote.pushdefault::\n+remote.pushDefault::\n \tThe remote to push to by default.  Overrides\n \t`branch.<name>.remote` for all branches, and is overridden by\n-\t`branch.<name>.pushremote` for specific branches.\n+\t`branch.<name>.pushRemote` for specific branches.\n \n remote.<name>.url::\n \tThe URL of a remote repository.  See linkgit:git-fetch[1] or\n@@ -2244,7 +2244,7 @@ remote.<name>.uploadpack::\n \tThe default program to execute on the remote side when fetching.  See\n \toption \\--upload-pack of linkgit:git-fetch-pack[1].\n \n-remote.<name>.tagopt::\n+remote.<name>.tagOpt::\n \tSetting this value to \\--no-tags disables automatic tag following when\n \tfetching from remote <name>. Setting it to \\--tags will fetch every\n \ttag from remote <name>, even if they are not reachable from remote\n@@ -2266,7 +2266,7 @@ remotes.<group>::\n \tThe list of remotes which are fetched by \"git remote update\n \t<group>\".  See linkgit:git-remote[1].\n \n-repack.usedeltabaseoffset::\n+repack.useDeltaBaseOffset::\n \tBy default, linkgit:git-repack[1] creates packs that use\n \tdelta-base offset. If you need to share your repository with\n \tGit older than version 1.4.4, either directly or via a dumb\n@@ -2289,7 +2289,7 @@ repack.writeBitmaps::\n \tspace and extra time spent on the initial repack.  Defaults to\n \tfalse.\n \n-rerere.autoupdate::\n+rerere.autoUpdate::\n \tWhen set to true, `git-rerere` updates the index with the\n \tresulting contents after it cleanly resolves conflicts using\n \tpreviously recorded resolution.  Defaults to false.\n@@ -2308,12 +2308,12 @@ sendemail.identity::\n \tvalues in the 'sendemail' section. The default identity is\n \tthe value of 'sendemail.identity'.\n \n-sendemail.smtpencryption::\n+sendemail.smtpEncryption::\n \tSee linkgit:git-send-email[1] for description.  Note that this\n \tsetting is not subject to the 'identity' mechanism.\n \n sendemail.smtpssl (deprecated)::\n-\tDeprecated alias for 'sendemail.smtpencryption = ssl'.\n+\tDeprecated alias for 'sendemail.smtpEncryption = ssl'.\n \n sendemail.smtpsslcertpath::\n \tPath to ca-certificates (either a directory or a single file).\n@@ -2325,29 +2325,29 @@ sendemail.<identity>.*::\n \tidentity is selected, through command-line or\n \t'sendemail.identity'.\n \n-sendemail.aliasesfile::\n-sendemail.aliasfiletype::\n+sendemail.aliasesFile::\n+sendemail.aliasFileType::\n sendemail.annotate::\n sendemail.bcc::\n sendemail.cc::\n-sendemail.cccmd::\n-sendemail.chainreplyto::\n+sendemail.ccCmd::\n+sendemail.chainReplyTo::\n sendemail.confirm::\n-sendemail.envelopesender::\n+sendemail.envelopeSender::\n sendemail.from::\n-sendemail.multiedit::\n+sendemail.multiEdit::\n sendemail.signedoffbycc::\n-sendemail.smtppass::\n+sendemail.smtpPass::\n sendemail.suppresscc::\n-sendemail.suppressfrom::\n+sendemail.suppressFrom::\n sendemail.to::\n-sendemail.smtpdomain::\n-sendemail.smtpserver::\n-sendemail.smtpserverport::\n-sendemail.smtpserveroption::\n-sendemail.smtpuser::\n+sendemail.smtpDomain::\n+sendemail.smtpServer::\n+sendemail.smtpServerPort::\n+sendemail.smtpServerOption::\n+sendemail.smtpUser::\n sendemail.thread::\n-sendemail.transferencoding::\n+sendemail.transferEncoding::\n sendemail.validate::\n sendemail.xmailer::\n \tSee linkgit:git-send-email[1] for description.\n@@ -2399,7 +2399,7 @@ If this variable is not specified, it defaults to 'normal'.\n This variable can be overridden with the -u|--untracked-files option\n of linkgit:git-status[1] and linkgit:git-commit[1].\n \n-status.submodulesummary::\n+status.submoduleSummary::\n \tDefaults to false.\n \tIf this is set to a non zero number or true (identical to -1 or an\n \tunlimited number), the submodule summary will be enabled and a\n@@ -2474,9 +2474,9 @@ transfer.fsckObjects::\n \tnot set, the value of this variable is used instead.\n \tDefaults to false.\n \n-transfer.hiderefs::\n-\tThis variable can be used to set both `receive.hiderefs`\n-\tand `uploadpack.hiderefs` at the same time to the same\n+transfer.hideRefs::\n+\tThis variable can be used to set both `receive.hideRefs`\n+\tand `uploadpack.hideRefs` at the same time to the same\n \tvalues.  See entries for these other variables.\n \n transfer.unpackLimit::\n@@ -2491,7 +2491,7 @@ uploadarchive.allowUnreachable::\n \tlinkgit:git-upload-archive[1] for more details. Defaults to\n \t`false`.\n \n-uploadpack.hiderefs::\n+uploadpack.hideRefs::\n \tString(s) `upload-pack` uses to decide which refs to omit\n \tfrom its initial advertisement.  Use more than one\n \tdefinitions to specify multiple prefix strings. A ref that\n@@ -2501,12 +2501,12 @@ uploadpack.hiderefs::\n \tfetch` will fail.  See also `uploadpack.allowtipsha1inwant`.\n \n uploadpack.allowtipsha1inwant::\n-\tWhen `uploadpack.hiderefs` is in effect, allow `upload-pack`\n+\tWhen `uploadpack.hideRefs` is in effect, allow `upload-pack`\n \tto accept a fetch request that asks for an object at the tip\n \tof a hidden ref (by default, such a request is rejected).\n-\tsee also `uploadpack.hiderefs`.\n+\tsee also `uploadpack.hideRefs`.\n \n-uploadpack.keepalive::\n+uploadpack.keepAlive::\n \tWhen `upload-pack` has started `pack-objects`, there may be a\n \tquiet period while `pack-objects` prepares the pack. Normally\n \tit would output progress information, but if `--quiet` was used\n@@ -2514,7 +2514,7 @@ uploadpack.keepalive::\n \tthe pack data begins. Some clients and networks may consider\n \tthe server to be hung and give up. Setting this option instructs\n \t`upload-pack` to send an empty keepalive packet every\n-\t`uploadpack.keepalive` seconds. Setting this option to 0\n+\t`uploadpack.keepAlive` seconds. Setting this option to 0\n \tdisables keepalive packets entirely. The default is 5 seconds.\n \n url.<base>.insteadOf::\n@@ -2551,7 +2551,7 @@ user.name::\n \tCan be overridden by the 'GIT_AUTHOR_NAME' and 'GIT_COMMITTER_NAME'\n \tenvironment variables.  See linkgit:git-commit-tree[1].\n \n-user.signingkey::\n+user.signingKey::\n \tIf linkgit:git-tag[1] or linkgit:git-commit[1] is not selecting the\n \tkey you want it to automatically when creating a signed tag or\n \tcommit, you can override the default selection with this variable.\ndiff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt\nindex b001779..6eaa452 100644\n--- a/Documentation/diff-config.txt\n+++ b/Documentation/diff-config.txt\n@@ -1,4 +1,4 @@\n-diff.autorefreshindex::\n+diff.autoRefreshIndex::\n \tWhen using 'git diff' to compare with work tree\n \tfiles, do not consider stat-only change as changed.\n \tInstead, silently run `git update-index --refresh` to\n@@ -75,11 +75,11 @@ diff.ignoreSubmodules::\n \tcommands such as 'git diff-files'. 'git checkout' also honors\n \tthis setting when reporting uncommitted changes. Setting it to\n \t'all' disables the submodule summary normally shown by 'git commit'\n-\tand 'git status' when 'status.submodulesummary' is set unless it is\n+\tand 'git status' when 'status.submoduleSummary' is set unless it is\n \toverridden by using the --ignore-submodules command-line option.\n \tThe 'git submodule' commands are not affected by this setting.\n \n-diff.mnemonicprefix::\n+diff.mnemonicPrefix::\n \tIf set, 'git diff' uses a prefix pair that is different from the\n \tstandard \"a/\" and \"b/\" depending on what is being compared.  When\n \tthis configuration is in effect, reverse diff output also swaps\n@@ -98,7 +98,7 @@ diff.mnemonicprefix::\n diff.noprefix::\n \tIf set, 'git diff' does not show any source or destination prefix.\n \n-diff.orderfile::\n+diff.orderFile::\n \tFile indicating how to order files within a diff, using\n \tone shell glob pattern per line.\n \tCan be overridden by the '-O' option to linkgit:git-diff[1].\n@@ -148,7 +148,7 @@ diff.<driver>.textconv::\n \tconversion is used to generate a human-readable diff.  See\n \tlinkgit:gitattributes[5] for details.\n \n-diff.<driver>.wordregex::\n+diff.<driver>.wordRegex::\n \tThe regular expression that the diff driver should use to\n \tsplit words in a line.  See linkgit:gitattributes[5] for\n \tdetails.\ndiff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt\nindex 6cb083a..ccd4998 100644\n--- a/Documentation/diff-options.txt\n+++ b/Documentation/diff-options.txt\n@@ -432,8 +432,8 @@ endif::git-format-patch[]\n -O<orderfile>::\n \tOutput the patch in the order specified in the\n \t<orderfile>, which has one shell glob pattern per line.\n-\tThis overrides the `diff.orderfile` configuration variable\n-\t(see linkgit:git-config[1]).  To cancel `diff.orderfile`,\n+\tThis overrides the `diff.orderFile` configuration variable\n+\t(see linkgit:git-config[1]).  To cancel `diff.orderFile`,\n \tuse `-O/dev/null`.\n \n ifndef::git-format-patch[]\ndiff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt\nindex b09a783..45583d8 100644\n--- a/Documentation/fetch-options.txt\n+++ b/Documentation/fetch-options.txt\n@@ -68,7 +68,7 @@ endif::git-pull[]\n \tBy default, tags that point at objects that are downloaded\n \tfrom the remote repository are fetched and stored locally.\n \tThis option disables this automatic tag following. The default\n-\tbehavior for a remote may be specified with the remote.<name>.tagopt\n+\tbehavior for a remote may be specified with the remote.<name>.tagOpt\n \tsetting. See linkgit:git-config[1].\n \n ifndef::git-pull[]\ndiff --git a/Documentation/git-add.txt b/Documentation/git-add.txt\nindex 1c74907..f2eb907 100644\n--- a/Documentation/git-add.txt\n+++ b/Documentation/git-add.txt\n@@ -173,7 +173,7 @@ for \"git add --no-all <pathspec>...\", i.e. ignored removed files.\n Configuration\n -------------\n \n-The optional configuration variable `core.excludesfile` indicates a path to a\n+The optional configuration variable `core.excludesFile` indicates a path to a\n file containing patterns of file names to exclude from git-add, similar to\n $GIT_DIR/info/exclude.  Patterns in the exclude file are used in addition to\n those in info/exclude.  See linkgit:gitignore[5].\n@@ -317,7 +317,7 @@ After deciding the fate for all hunks, if there is any hunk\n that was chosen, the index is updated with the selected hunks.\n +\n You can omit having to type return here, by setting the configuration\n-variable `interactive.singlekey` to `true`.\n+variable `interactive.singleKey` to `true`.\n \n diff::\n \ndiff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt\nindex 9489664..d9ed6a1 100644\n--- a/Documentation/git-apply.txt\n+++ b/Documentation/git-apply.txt\n@@ -242,7 +242,7 @@ has no effect when `--index` or `--cached` is in use.\n Configuration\n -------------\n \n-apply.ignorewhitespace::\n+apply.ignoreWhitespace::\n \tSet to 'change' if you want changes in whitespace to be ignored by default.\n \tSet to one of: no, none, never, false if you want changes in\n \twhitespace to be significant.\ndiff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt\nindex 311b336..359619b 100644\n--- a/Documentation/git-branch.txt\n+++ b/Documentation/git-branch.txt\n@@ -51,7 +51,7 @@ When a local branch is started off a remote-tracking branch, Git sets up the\n branch (specifically the `branch.<name>.remote` and `branch.<name>.merge`\n configuration entries) so that 'git pull' will appropriately merge from\n the remote-tracking branch. This behavior may be changed via the global\n-`branch.autosetupmerge` configuration flag. That setting can be\n+`branch.autoSetupMerge` configuration flag. That setting can be\n overridden by using the `--track` and `--no-track` options, and\n changed later using `git branch --set-upstream-to`.\n \n@@ -166,14 +166,14 @@ This option is only applicable in non-verbose mode.\n \tupstream when the new branch is checked out.\n +\n This behavior is the default when the start point is a remote-tracking branch.\n-Set the branch.autosetupmerge configuration variable to `false` if you\n+Set the branch.autoSetupMerge configuration variable to `false` if you\n want `git checkout` and `git branch` to always behave as if '--no-track'\n were given. Set it to `always` if you want this behavior when the\n start-point is either a local or remote-tracking branch.\n \n --no-track::\n \tDo not set up \"upstream\" configuration, even if the\n-\tbranch.autosetupmerge configuration variable is true.\n+\tbranch.autoSetupMerge configuration variable is true.\n \n --set-upstream::\n \tIf specified branch does not exist yet or if `--force` has been\ndiff --git a/Documentation/git-check-ignore.txt b/Documentation/git-check-ignore.txt\nindex 788a011..e35cd04 100644\n--- a/Documentation/git-check-ignore.txt\n+++ b/Documentation/git-check-ignore.txt\n@@ -72,7 +72,7 @@ matching pattern, <source> is the pattern's source file, and <linenum>\n is the line number of the pattern within that source.  If the pattern\n contained a `!` prefix or `/` suffix, it will be preserved in the\n output.  <source> will be an absolute path when referring to the file\n-configured by `core.excludesfile`, or relative to the repository root\n+configured by `core.excludesFile`, or relative to the repository root\n when referring to `.git/info/exclude` or a per-directory exclude file.\n \n If `-z` is specified, the pathnames in the output are delimited by the\ndiff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt\nindex 33ad2ad..d504108 100644\n--- a/Documentation/git-checkout.txt\n+++ b/Documentation/git-checkout.txt\n@@ -144,7 +144,7 @@ explicitly give a name with '-b' in such a case.\n \n --no-track::\n \tDo not set up \"upstream\" configuration, even if the\n-\tbranch.autosetupmerge configuration variable is true.\n+\tbranch.autoSetupMerge configuration variable is true.\n \n -l::\n \tCreate the new branch's reflog; see linkgit:git-branch[1] for\n@@ -210,7 +210,7 @@ the conflicted merge in the specified paths.\n --conflict=<style>::\n \tThe same as --merge option above, but changes the way the\n \tconflicting hunks are presented, overriding the\n-\tmerge.conflictstyle configuration variable.  Possible values are\n+\tmerge.conflictStyle configuration variable.  Possible values are\n \t\"merge\" (default) and \"diff3\" (in addition to what is shown by\n \t\"merge\" style, shows the original contents).\n \ndiff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt\nindex a469eab..f5f2a8d 100644\n--- a/Documentation/git-commit-tree.txt\n+++ b/Documentation/git-commit-tree.txt\n@@ -59,7 +59,7 @@ OPTIONS\n \tGPG-sign commit.\n \n --no-gpg-sign::\n-\tCountermand `commit.gpgsign` configuration variable that is\n+\tCountermand `commit.gpgSign` configuration variable that is\n \tset to force each and every commit to be signed.\n \n \ndiff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt\nindex 1e74b75..b75a122 100644\n--- a/Documentation/git-commit.txt\n+++ b/Documentation/git-commit.txt\n@@ -310,7 +310,7 @@ configuration variable documented in linkgit:git-config[1].\n \tGPG-sign commit.\n \n --no-gpg-sign::\n-\tCountermand `commit.gpgsign` configuration variable that is\n+\tCountermand `commit.gpgSign` configuration variable that is\n \tset to force each and every commit to be signed.\n \n \\--::\ndiff --git a/Documentation/git-config.txt b/Documentation/git-config.txt\nindex 9dfa1a5..02ec096 100644\n--- a/Documentation/git-config.txt\n+++ b/Documentation/git-config.txt\n@@ -405,7 +405,7 @@ true\n % git config --bool --get-urlmatch http.sslverify https://weak.example.com\n false\n % git config --get-urlmatch http https://weak.example.com\n-http.cookiefile /tmp/cookie.txt\n+http.cookieFile /tmp/cookie.txt\n http.sslverify false\n ------------\n \ndiff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt\nindex 4961f1a..2a24864 100644\n--- a/Documentation/git-cvsserver.txt\n+++ b/Documentation/git-cvsserver.txt\n@@ -154,7 +154,7 @@ with CVS_SERVER (and shouldn't) as 'git-shell' understands `cvs` to mean\n    [gitcvs]\n         enabled=1\n         # optional for debugging\n-        logfile=/path/to/logfile\n+        logFile=/path/to/logfile\n \n ------\n Note: you need to ensure each user that is going to invoke 'git-cvsserver' has\n@@ -254,14 +254,14 @@ Configuring database backend\n its documentation if changing these variables, especially\n about `DBI->connect()`.\n \n-gitcvs.dbname::\n+gitcvs.dbName::\n \tDatabase name. The exact meaning depends on the\n \tselected database driver, for SQLite this is a filename.\n \tSupports variable substitution (see below). May\n \tnot contain semicolons (`;`).\n \tDefault: '%Ggitcvs.%m.sqlite'\n \n-gitcvs.dbdriver::\n+gitcvs.dbDriver::\n \tUsed DBI driver. You can specify any available driver\n \tfor this here, but it might not work. cvsserver is tested\n \twith 'DBD::SQLite', reported to work with\n@@ -271,12 +271,12 @@ gitcvs.dbdriver::\n \tDefault: 'SQLite'\n \n gitcvs.dbuser::\n-\tDatabase user. Only useful if setting `dbdriver`, since\n+\tDatabase user. Only useful if setting `dbDriver`, since\n \tSQLite has no concept of database users. Supports variable\n \tsubstitution (see below).\n \n-gitcvs.dbpass::\n-\tDatabase password.  Only useful if setting `dbdriver`, since\n+gitcvs.dbPass::\n+\tDatabase password.  Only useful if setting `dbDriver`, since\n \tSQLite has no concept of database passwords.\n \n gitcvs.dbTableNamePrefix::\n@@ -288,7 +288,7 @@ All variables can also be set per access method, see <<configaccessmethod,above>\n \n Variable substitution\n ^^^^^^^^^^^^^^^^^^^^^\n-In `dbdriver` and `dbuser` you can use the following variables:\n+In `dbDriver` and `dbUser` you can use the following variables:\n \n %G::\n \tGit directory name\n@@ -413,16 +413,16 @@ about end-of-line conversion.\n \n Alternatively, if `gitcvs.usecrlfattr` config is not enabled\n or the attributes do not allow automatic detection for a filename, then\n-the server uses the `gitcvs.allbinary` config for the default setting.\n-If `gitcvs.allbinary` is set, then file not otherwise\n+the server uses the `gitcvs.allBinary` config for the default setting.\n+If `gitcvs.allBinary` is set, then file not otherwise\n specified will default to '-kb' mode. Otherwise the '-k' mode\n-is left blank. But if `gitcvs.allbinary` is set to \"guess\", then\n+is left blank. But if `gitcvs.allBinary` is set to \"guess\", then\n the correct '-k' mode will be guessed based on the contents of\n the file.\n \n For best consistency with 'cvs', it is probably best to override the\n defaults by setting `gitcvs.usecrlfattr` to true,\n-and `gitcvs.allbinary` to \"guess\".\n+and `gitcvs.allBinary` to \"guess\".\n \n Dependencies\n ------------\ndiff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt\nindex 8deb614..e62d9a0 100644\n--- a/Documentation/git-fetch.txt\n+++ b/Documentation/git-fetch.txt\n@@ -26,7 +26,7 @@ By default, any tag that points into the histories being fetched is\n also fetched; the effect is to fetch tags that\n point at branches that you are interested in.  This default behavior\n can be changed by using the --tags or --no-tags options or by\n-configuring remote.<name>.tagopt.  By using a refspec that fetches tags\n+configuring remote.<name>.tagOpt.  By using a refspec that fetches tags\n explicitly, you can fetch tags that do not point into branches you\n are interested in as well.\n \ndiff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt\nindex c0fd470..bb3ea93 100644\n--- a/Documentation/git-format-patch.txt\n+++ b/Documentation/git-format-patch.txt\n@@ -273,13 +273,13 @@ attachments, and sign off patches with configuration variables.\n ------------\n [format]\n \theaders = \"Organization: git-foo\\n\"\n-\tsubjectprefix = CHANGE\n+\tsubjectPrefix = CHANGE\n \tsuffix = .txt\n \tnumbered = auto\n \tto = <email>\n \tcc = <email>\n \tattach [ = mime-boundary-string ]\n-\tsignoff = true\n+\tsignOff = true\n \tcoverletter = auto\n ------------\n \ndiff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt\nindex 273c466..5223498 100644\n--- a/Documentation/git-gc.txt\n+++ b/Documentation/git-gc.txt\n@@ -54,10 +54,10 @@ all loose objects are combined into a single pack using\n `git repack -d -l`.  Setting the value of `gc.auto` to 0\n disables automatic packing of loose objects.\n +\n-If the number of packs exceeds the value of `gc.autopacklimit`,\n+If the number of packs exceeds the value of `gc.autoPackLimit`,\n then existing packs (except those marked with a `.keep` file)\n are consolidated into a single pack by using the `-A` option of\n-'git repack'. Setting `gc.autopacklimit` to 0 disables\n+'git repack'. Setting `gc.autoPackLimit` to 0 disables\n automatic consolidation of packs.\n \n --prune=<date>::\n@@ -101,18 +101,18 @@ branches:\n ------------\n [gc \"refs/remotes/*\"]\n \treflogExpire = never\n-\treflogexpireUnreachable = 3 days\n+\treflogExpireUnreachable = 3 days\n ------------\n \n-The optional configuration variable 'gc.rerereresolved' indicates\n+The optional configuration variable 'gc.rerereResolved' indicates\n how long records of conflicted merge you resolved earlier are\n kept.  This defaults to 60 days.\n \n-The optional configuration variable 'gc.rerereunresolved' indicates\n+The optional configuration variable 'gc.rerereUnresolved' indicates\n how long records of conflicted merge you have not resolved are\n kept.  This defaults to 15 days.\n \n-The optional configuration variable 'gc.packrefs' determines if\n+The optional configuration variable 'gc.packRefs' determines if\n 'git gc' runs 'git pack-refs'. This can be set to \"notbare\" to enable\n it within all non-bare repos or it can be set to a boolean value.\n This defaults to true.\ndiff --git a/Documentation/git-init.txt b/Documentation/git-init.txt\nindex 369f889..8174d27 100644\n--- a/Documentation/git-init.txt\n+++ b/Documentation/git-init.txt\n@@ -125,7 +125,7 @@ The template directory will be one of the following (in order):\n \n  - the contents of the `$GIT_TEMPLATE_DIR` environment variable;\n \n- - the `init.templatedir` configuration variable; or\n+ - the `init.templateDir` configuration variable; or\n \n  - the default template directory: `/usr/share/git-core/templates`.\n \ndiff --git a/Documentation/git-instaweb.txt b/Documentation/git-instaweb.txt\nindex f3eef51..cc75b25 100644\n--- a/Documentation/git-instaweb.txt\n+++ b/Documentation/git-instaweb.txt\n@@ -76,7 +76,7 @@ You may specify configuration in your .git/config\n \thttpd = apache2 -f\n \tport = 4321\n \tbrowser = konqueror\n-\tmodulepath = /usr/lib/apache2/modules\n+\tmodulePath = /usr/lib/apache2/modules\n \n -----------------------------------------------------------------------\n \ndiff --git a/Documentation/git-log.txt b/Documentation/git-log.txt\nindex 1f7bc67..18bc716 100644\n--- a/Documentation/git-log.txt\n+++ b/Documentation/git-log.txt\n@@ -184,7 +184,7 @@ log.date::\n \t`--date` option.)  Defaults to \"default\", which means to write\n \tdates like `Sat May 8 19:35:34 2010 -0500`.\n \n-log.showroot::\n+log.showRoot::\n \tIf `false`, `git log` and related commands will not treat the\n \tinitial commit as a big creation event.  Any root commits in\n \t`git log -p` output would be shown without a diff attached.\ndiff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\nindex cf2c374..1f94908 100644\n--- a/Documentation/git-merge.txt\n+++ b/Documentation/git-merge.txt\n@@ -232,7 +232,7 @@ Barbie's remark on your side.  The only thing you can tell is that your\n side wants to say it is hard and you'd prefer to go shopping, while the\n other side wants to claim it is easy.\n \n-An alternative style can be used by setting the \"merge.conflictstyle\"\n+An alternative style can be used by setting the \"merge.conflictStyle\"\n configuration variable to \"diff3\".  In \"diff3\" style, the above conflict\n may look like this:\n \n@@ -329,7 +329,7 @@ CONFIGURATION\n -------------\n include::merge-config.txt[]\n \n-branch.<name>.mergeoptions::\n+branch.<name>.mergeOptions::\n \tSets default options for merging into branch <name>. The syntax and\n \tsupported options are the same as those of 'git merge', but option\n \tvalues containing whitespace characters are currently not supported.\ndiff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\nindex 200eb22..d3d236c 100644\n--- a/Documentation/git-pull.txt\n+++ b/Documentation/git-pull.txt\n@@ -117,7 +117,7 @@ locally created merge commits will not be flattened.\n +\n When false, merge the current branch into the upstream branch.\n +\n-See `pull.rebase`, `branch.<name>.rebase` and `branch.autosetuprebase` in\n+See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in\n linkgit:git-config[1] if you want to make `git pull` always use\n `--rebase` instead of merging.\n +\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex 924827d..d728030 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -207,10 +207,10 @@ rebase.stat::\n \tWhether to show a diffstat of what changed upstream since the last\n \trebase. False by default.\n \n-rebase.autosquash::\n+rebase.autoSquash::\n \tIf set to true enable '--autosquash' option by default.\n \n-rebase.autostash::\n+rebase.autoStash::\n \tIf set to true enable '--autostash' option by default.\n \n OPTIONS\n@@ -414,7 +414,7 @@ squash/fixup series.\n This option is only valid when the '--interactive' option is used.\n +\n If the '--autosquash' option is enabled by default using the\n-configuration variable `rebase.autosquash`, this option can be\n+configuration variable `rebase.autoSquash`, this option can be\n used to override and disable this setting.\n \n --[no-]autostash::\ndiff --git a/Documentation/git-receive-pack.txt b/Documentation/git-receive-pack.txt\nindex 9016960..000ee8d 100644\n--- a/Documentation/git-receive-pack.txt\n+++ b/Documentation/git-receive-pack.txt\n@@ -100,7 +100,7 @@ the following environment variables:\n \tstarting time is different by this many seconds from the\n \tcurrent session.  Only meaningful when\n \t`GIT_PUSH_CERT_NONCE_STATUS` says `SLOP`.\n-\tAlso read about `receive.certnonceslop` variable in\n+\tAlso read about `receive.certNonceSlop` variable in\n \tlinkgit:git-config[1].\n \n This hook is called before any refname is updated and before any\ndiff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt\nindex 4786a78..0e0bd36 100644\n--- a/Documentation/git-repack.txt\n+++ b/Documentation/git-repack.txt\n@@ -115,7 +115,7 @@ other objects in that pack they already have locally.\n \tWrite a reachability bitmap index as part of the repack. This\n \tonly makes sense when used with `-a` or `-A`, as the bitmaps\n \tmust be able to refer to all reachable objects. This option\n-\toverrides the setting of `pack.writebitmaps`.\n+\toverrides the setting of `pack.writeBitmaps`.\n \n --pack-kept-objects::\n \tInclude objects in `.keep` files when repacking.  Note that we\n@@ -123,7 +123,7 @@ other objects in that pack they already have locally.\n \tThis means that we may duplicate objects, but this makes the\n \toption safe to use when there are concurrent pushes or fetches.\n \tThis option is generally only useful if you are writing bitmaps\n-\twith `-b` or `pack.writebitmaps`, as it ensures that the\n+\twith `-b` or `pack.writeBitmaps`, as it ensures that the\n \tbitmapped packfile has the necessary objects.\n \n Configuration\ndiff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt\nindex a62227f..9ee083c 100644\n--- a/Documentation/git-rerere.txt\n+++ b/Documentation/git-rerere.txt\n@@ -69,7 +69,7 @@ Prune records of conflicted merges that\n occurred a long time ago.  By default, unresolved conflicts older\n than 15 days and resolved conflicts older than 60\n days are pruned.  These defaults are controlled via the\n-`gc.rerereunresolved` and `gc.rerereresolved` configuration\n+`gc.rerereUnresolved` and `gc.rerereResolved` configuration\n variables respectively.\n \n \ndiff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt\nindex f248a86..8045546 100644\n--- a/Documentation/git-send-email.txt\n+++ b/Documentation/git-send-email.txt\n@@ -47,7 +47,7 @@ Composing\n --annotate::\n \tReview and edit each patch you're about to send. Default is the value\n \tof 'sendemail.annotate'. See the CONFIGURATION section for\n-\t'sendemail.multiedit'.\n+\t'sendemail.multiEdit'.\n \n --bcc=<address>::\n \tSpecify a \"Bcc:\" value for each email. Default is the value of\n@@ -73,7 +73,7 @@ and In-Reply-To headers will be used unless they are removed.\n +\n Missing From or In-Reply-To headers will be prompted for.\n +\n-See the CONFIGURATION section for 'sendemail.multiedit'.\n+See the CONFIGURATION section for 'sendemail.multiEdit'.\n \n --from=<address>::\n \tSpecify the sender of the emails.  If not specified on the command line,\n@@ -156,31 +156,31 @@ Sending\n \tsubscribed to a list. In order to use the 'From' address, set the\n \tvalue to \"auto\". If you use the sendmail binary, you must have\n \tsuitable privileges for the -f parameter.  Default is the value of the\n-\t'sendemail.envelopesender' configuration variable; if that is\n+\t'sendemail.envelopeSender' configuration variable; if that is\n \tunspecified, choosing the envelope sender is left to your MTA.\n \n --smtp-encryption=<encryption>::\n \tSpecify the encryption to use, either 'ssl' or 'tls'.  Any other\n \tvalue reverts to plain SMTP.  Default is the value of\n-\t'sendemail.smtpencryption'.\n+\t'sendemail.smtpEncryption'.\n \n --smtp-domain=<FQDN>::\n \tSpecifies the Fully Qualified Domain Name (FQDN) used in the\n \tHELO/EHLO command to the SMTP server.  Some servers require the\n \tFQDN to match your IP address.  If not set, git send-email attempts\n \tto determine your FQDN automatically.  Default is the value of\n-\t'sendemail.smtpdomain'.\n+\t'sendemail.smtpDomain'.\n \n --smtp-pass[=<password>]::\n \tPassword for SMTP-AUTH. The argument is optional: If no\n \targument is specified, then the empty string is used as\n-\tthe password. Default is the value of 'sendemail.smtppass',\n+\tthe password. Default is the value of 'sendemail.smtpPass',\n \thowever '--smtp-pass' always overrides this value.\n +\n Furthermore, passwords need not be specified in configuration files\n or on the command line. If a username has been specified (with\n-'--smtp-user' or a 'sendemail.smtpuser'), but no password has been\n-specified (with '--smtp-pass' or 'sendemail.smtppass'), then\n+'--smtp-user' or a 'sendemail.smtpUser'), but no password has been\n+specified (with '--smtp-pass' or 'sendemail.smtpPass'), then\n a password is obtained using 'git-credential'.\n \n --smtp-server=<host>::\n@@ -188,7 +188,7 @@ a password is obtained using 'git-credential'.\n \t`smtp.example.com` or a raw IP address).  Alternatively it can\n \tspecify a full pathname of a sendmail-like program instead;\n \tthe program must support the `-i` option.  Default value can\n-\tbe specified by the 'sendemail.smtpserver' configuration\n+\tbe specified by the 'sendemail.smtpServer' configuration\n \toption; the built-in default is `/usr/sbin/sendmail` or\n \t`/usr/lib/sendmail` if such program is available, or\n \t`localhost` otherwise.\n@@ -199,11 +199,11 @@ a password is obtained using 'git-credential'.\n \tsubmission port 587, or the common SSL smtp port 465);\n \tsymbolic port names (e.g. \"submission\" instead of 587)\n \tare also accepted. The port can also be set with the\n-\t'sendemail.smtpserverport' configuration variable.\n+\t'sendemail.smtpServerPort' configuration variable.\n \n --smtp-server-option=<option>::\n \tIf set, specifies the outgoing SMTP server option to use.\n-\tDefault value can be specified by the 'sendemail.smtpserveroption'\n+\tDefault value can be specified by the 'sendemail.smtpServerOption'\n \tconfiguration option.\n +\n The --smtp-server-option option must be repeated for each option you want\n@@ -225,8 +225,8 @@ must be used for each option.\n \tbe the best choice on most platforms).\n \n --smtp-user=<user>::\n-\tUsername for SMTP-AUTH. Default is the value of 'sendemail.smtpuser';\n-\tif a username is not specified (with '--smtp-user' or 'sendemail.smtpuser'),\n+\tUsername for SMTP-AUTH. Default is the value of 'sendemail.smtpUser';\n+\tif a username is not specified (with '--smtp-user' or 'sendemail.smtpUser'),\n \tthen authentication is not attempted.\n \n --smtp-debug=0|1::\n@@ -247,14 +247,14 @@ Automating\n \tSpecify a command to execute once per patch file which\n \tshould generate patch file specific \"Cc:\" entries.\n \tOutput of this command must be single email address per line.\n-\tDefault is the value of 'sendemail.cccmd' configuration value.\n+\tDefault is the value of 'sendemail.ccCmd' configuration value.\n \n --[no-]chain-reply-to::\n \tIf this is set, each email will be sent as a reply to the previous\n \temail sent.  If disabled with \"--no-chain-reply-to\", all emails after\n \tthe first will be sent as replies to the first email sent.  When using\n \tthis, it is recommended that the first file given be an overview of the\n-\tentire patch series. Disabled by default, but the 'sendemail.chainreplyto'\n+\tentire patch series. Disabled by default, but the 'sendemail.chainReplyTo'\n \tconfiguration variable can be used to enable it.\n \n --identity=<identity>::\n@@ -304,7 +304,7 @@ specified, as well as 'body' if --no-signed-off-cc is specified.\n \n --[no-]suppress-from::\n \tIf this is set, do not add the From: address to the cc: list.\n-\tDefault is the value of 'sendemail.suppressfrom' configuration\n+\tDefault is the value of 'sendemail.suppressFrom' configuration\n \tvalue; if that is unspecified, default to --no-suppress-from.\n \n --[no-]thread::\n@@ -377,15 +377,15 @@ default to '--validate'.\n CONFIGURATION\n -------------\n \n-sendemail.aliasesfile::\n+sendemail.aliasesFile::\n \tTo avoid typing long email addresses, point this to one or more\n-\temail aliases files.  You must also supply 'sendemail.aliasfiletype'.\n+\temail aliases files.  You must also supply 'sendemail.aliasFileType'.\n \n-sendemail.aliasfiletype::\n-\tFormat of the file(s) specified in sendemail.aliasesfile. Must be\n+sendemail.aliasFileType::\n+\tFormat of the file(s) specified in sendemail.aliasesFile. Must be\n \tone of 'mutt', 'mailrc', 'pine', 'elm', or 'gnus'.\n \n-sendemail.multiedit::\n+sendemail.multiEdit::\n \tIf true (default), a single editor instance will be spawned to edit\n \tfiles you have to edit (patches when '--annotate' is used, and the\n \tsummary when '--compose' is used). If false, files will be edited one\n@@ -404,10 +404,10 @@ To use 'git send-email' to send your patches through the GMail SMTP server,\n edit ~/.gitconfig to specify your account settings:\n \n \t[sendemail]\n-\t\tsmtpencryption = tls\n-\t\tsmtpserver = smtp.gmail.com\n-\t\tsmtpuser = yourname@gmail.com\n-\t\tsmtpserverport = 587\n+\t\tsmtpEncryption = tls\n+\t\tsmtpServer = smtp.gmail.com\n+\t\tsmtpUser = yourname@gmail.com\n+\t\tsmtpServerPort = 587\n \n Once your commits are ready to be sent to the mailing list, run the\n following commands:\ndiff --git a/Documentation/git-status.txt b/Documentation/git-status.txt\nindex 4d8d530..b3319f7 100644\n--- a/Documentation/git-status.txt\n+++ b/Documentation/git-status.txt\n@@ -77,7 +77,7 @@ configuration variable documented in linkgit:git-config[1].\n \tonly changes to the commits stored in the superproject are shown (this was\n \tthe behavior before 1.7.0). Using \"all\" hides all changes to submodules\n \t(and suppresses the output of submodule summaries when the config option\n-\t`status.submodulesummary` is set).\n+\t`status.submoduleSummary` is set).\n \n --ignored::\n \tShow ignored files as well.\n@@ -207,7 +207,7 @@ If the config variable `status.relativePaths` is set to false, then all\n paths shown are relative to the repository root, not to the current\n directory.\n \n-If `status.submodulesummary` is set to a non zero number or true (identical\n+If `status.submoduleSummary` is set to a non zero number or true (identical\n to -1 or an unlimited number), the submodule summary will be enabled for\n the long format and a summary of commits for modified submodules will be\n shown (see --summary-limit option of linkgit:git-submodule[1]). Please note\ndiff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt\nindex e953ba4..bfba4ef 100644\n--- a/Documentation/git-tag.txt\n+++ b/Documentation/git-tag.txt\n@@ -161,7 +161,7 @@ it in the repository configuration as follows:\n \n -------------------------------------\n [user]\n-    signingkey = <gpg-key-id>\n+    signingKey = <gpg-key-id>\n -------------------------------------\n \n \ndiff --git a/Documentation/git.txt b/Documentation/git.txt\nindex 52c4d2a..4269907 100644\n--- a/Documentation/git.txt\n+++ b/Documentation/git.txt\n@@ -918,7 +918,7 @@ for further details.\n \tIf this environment variable is set, then Git commands which need to\n \tacquire passwords or passphrases (e.g. for HTTP or IMAP authentication)\n \twill call this program with a suitable prompt as command-line argument\n-\tand read the password from its STDOUT. See also the 'core.askpass'\n+\tand read the password from its STDOUT. See also the 'core.askPass'\n \toption in linkgit:git-config[1].\n \n 'GIT_TERMINAL_PROMPT'::\ndiff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt\nindex c892ffa..70899b3 100644\n--- a/Documentation/gitattributes.txt\n+++ b/Documentation/gitattributes.txt\n@@ -80,7 +80,7 @@ Attributes which should be version-controlled and distributed to other\n repositories (i.e., attributes of interest to all users) should go into\n `.gitattributes` files. Attributes that should affect all repositories\n for a single user should be placed in a file specified by the\n-`core.attributesfile` configuration option (see linkgit:git-config[1]).\n+`core.attributesFile` configuration option (see linkgit:git-config[1]).\n Its default value is $XDG_CONFIG_HOME/git/attributes. If $XDG_CONFIG_HOME\n is either not set or empty, $HOME/.config/git/attributes is used instead.\n Attributes for all users on a system should be placed in the\ndiff --git a/Documentation/gitcredentials.txt b/Documentation/gitcredentials.txt\nindex 47576be..1c75be0 100644\n--- a/Documentation/gitcredentials.txt\n+++ b/Documentation/gitcredentials.txt\n@@ -32,7 +32,7 @@ strategies to ask the user for usernames and passwords:\n    to the program on the command line, and the user's input is read\n    from its standard output.\n \n-2. Otherwise, if the `core.askpass` configuration variable is set, its\n+2. Otherwise, if the `core.askPass` configuration variable is set, its\n    value is used as above.\n \n 3. Otherwise, if the `SSH_ASKPASS` environment variable is set, its\ndiff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt\nindex 4fd0442..473623d 100644\n--- a/Documentation/gitignore.txt\n+++ b/Documentation/gitignore.txt\n@@ -38,7 +38,7 @@ precedence, the last matching pattern decides the outcome):\n  * Patterns read from `$GIT_DIR/info/exclude`.\n \n  * Patterns read from the file specified by the configuration\n-   variable 'core.excludesfile'.\n+   variable 'core.excludesFile'.\n \n Which file to place a pattern in depends on how the pattern is meant to\n be used.\n@@ -56,7 +56,7 @@ be used.\n  * Patterns which a user wants Git to\n    ignore in all situations (e.g., backup or temporary files generated by\n    the user's editor of choice) generally go into a file specified by\n-   `core.excludesfile` in the user's `~/.gitconfig`. Its default value is\n+   `core.excludesFile` in the user's `~/.gitconfig`. Its default value is\n    $XDG_CONFIG_HOME/git/ignore. If $XDG_CONFIG_HOME is either not set or\n    empty, $HOME/.config/git/ignore is used instead.\n \ndiff --git a/Documentation/gitweb.conf.txt b/Documentation/gitweb.conf.txt\nindex ebe7a6c..0506f07 100644\n--- a/Documentation/gitweb.conf.txt\n+++ b/Documentation/gitweb.conf.txt\n@@ -706,7 +706,7 @@ show-sizes::\n \tI/O.  Enabled by default.\n +\n This feature can be configured on a per-repository basis via\n-repository's `gitweb.showsizes` configuration variable (boolean).\n+repository's `gitweb.showSizes` configuration variable (boolean).\n \n patches::\n \tEnable and configure \"patches\" view, which displays list of commits in email\ndiff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt\nindex d78d6d8..8a0e52f 100644\n--- a/Documentation/merge-config.txt\n+++ b/Documentation/merge-config.txt\n@@ -1,4 +1,4 @@\n-merge.conflictstyle::\n+merge.conflictStyle::\n \tSpecify the style in which conflicted hunks are written out to\n \tworking tree files upon merge.  The default is \"merge\", which\n \tshows a `<<<<<<<` conflict marker, changes made by one side,\ndiff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\nindex 7330d88..68978f5 100644\n--- a/Documentation/user-manual.txt\n+++ b/Documentation/user-manual.txt\n@@ -1200,7 +1200,7 @@ for other users who clone your repository.\n If you wish the exclude patterns to affect only certain repositories\n (instead of every repository for a given project), you may instead put\n them in a file in your repository named `.git/info/exclude`, or in any\n-file specified by the `core.excludesfile` configuration variable.\n+file specified by the `core.excludesFile` configuration variable.\n Some Git commands can also take exclude patterns directly on the\n command line.  See linkgit:gitignore[5] for the details.\n \n-- \n2.3.2.360.g1f807f9\n"}]}