Merge branch 'nd/config-doc-camelCase'

Documentation updates. * nd/config-doc-camelCase: *config.txt: stick to camelCase naming convention
git-mirror · Mar 23, 2015 · aa65b86 · aa65b86
2 parents 07da4e0 + da0005b
commit aa65b86
Show file tree

Hide file tree

Showing 37 changed files with 212 additions and 212 deletions.
diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines
@@ -526,7 +526,7 @@ Writing Documentation:
  `backticks around word phrases`, do so.
    `--pretty=oneline`
    `git rev-list`
-   `remote.pushdefault`
+   `remote.pushDefault`
 
  Word phrases enclosed in `backtick characters` are rendered literally
  and will not be further expanded. The use of `backticks` to achieve the

diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt
@@ -4,7 +4,7 @@
 
 --root::
 	Do not treat root commits as boundaries.  This can also be
-	controlled via the `blame.showroot` config option.
+	controlled via the `blame.showRoot` config option.
 
 --show-stats::
 	Include additional statistics at the end of blame output.