From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 28 Sep 2017 05:47:56 +0000 (+0900)
Subject: Merge branch 'ks/doc-use-camelcase-for-config-name'
X-Git-Tag: v2.15.0-rc0~38
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/47d26f0a66de017d7516e3414517eb5898f3723f?ds=inline;hp=-c

Merge branch 'ks/doc-use-camelcase-for-config-name'

Doc update.

* ks/doc-use-camelcase-for-config-name:
doc: camelCase the config variables to improve readability
---

47d26f0a66de017d7516e3414517eb5898f3723f
diff --combined Documentation/git-branch.txt
index e292737b9c,7463dc44a7..58f1e5c9c7
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@@ -92,10 -92,10 +92,10 @@@ OPTION
  	all changes made to the branch ref, enabling use of date
  	based sha1 expressions such as "<branchname>@\{yesterday}".
  	Note that in non-bare repositories, reflogs are usually
- 	enabled by default by the `core.logallrefupdates` config option.
+ 	enabled by default by the `core.logAllRefUpdates` config option.
  	The negated form `--no-create-reflog` only overrides an earlier
  	`--create-reflog`, but currently does not negate the setting of
- 	`core.logallrefupdates`.
+ 	`core.logAllRefUpdates`.
  
  -f::
  --force::
@@@ -195,8 -195,10 +195,8 @@@ start-point is either a local or remote
  	branch.autoSetupMerge configuration variable is true.
  
  --set-upstream::
 -	If specified branch does not exist yet or if `--force` has been
 -	given, acts exactly like `--track`. Otherwise sets up configuration
 -	like `--track` would when creating the branch, except that where
 -	branch points to is not changed.
 +	As this option had confusing syntax, it is no longer supported.
 +	Please use `--track` or `--set-upstream-to` instead.
  
  -u <upstream>::
  --set-upstream-to=<upstream>::