diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-23 14:32:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-23 14:32:46 -0700 |
| commit | 322c6244651c408d924f71f73effd8ed833916d3 (patch) | |
| tree | 6e8cf8d283e2a923cc330b4b64eeb3c972341edd /git-checkout.html | |
| parent | 0762262193bb8a218def4fd749a68476d5337b5d (diff) | |
| download | git-htmldocs-322c6244651c408d924f71f73effd8ed833916d3.tar.gz | |
Autogenerated HTML docs for v2.3.4-263-gf53fc
Diffstat (limited to 'git-checkout.html')
| -rw-r--r-- | git-checkout.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-checkout.html b/git-checkout.html index 3d2da8a5e..e2b965a7f 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -945,7 +945,7 @@ explicitly give a name with <em>-b</em> in such a case.</p></div> <dd>
<p>
Do not set up "upstream" configuration, even if the
- branch.autosetupmerge configuration variable is true.
+ branch.autoSetupMerge configuration variable is true.
</p>
</dd>
<dt class="hdlist1">
@@ -1038,7 +1038,7 @@ the conflicted merge in the specified paths.</p></div> <p>
The same as --merge option above, but changes the way the
conflicting hunks are presented, overriding the
- merge.conflictstyle configuration variable. Possible values are
+ merge.conflictStyle configuration variable. Possible values are
"merge" (default) and "diff3" (in addition to what is shown by
"merge" style, shows the original contents).
</p>
@@ -1363,7 +1363,7 @@ $ git add frotz</code></pre> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2014-01-27 13:30:07 PST
+Last updated 2015-03-23 14:31:16 PDT
</div>
</div>
</body>
|