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.txt | |
| parent | 0762262193bb8a218def4fd749a68476d5337b5d (diff) | |
| download | git-htmldocs-322c6244651c408d924f71f73effd8ed833916d3.tar.gz | |
Autogenerated HTML docs for v2.3.4-263-gf53fc
Diffstat (limited to 'git-checkout.txt')
| -rw-r--r-- | git-checkout.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-checkout.txt b/git-checkout.txt index 33ad2adf5..d5041082e 100644 --- a/git-checkout.txt +++ b/git-checkout.txt @@ -144,7 +144,7 @@ explicitly give a name with '-b' in such a case. --no-track:: Do not set up "upstream" configuration, even if the - branch.autosetupmerge configuration variable is true. + branch.autoSetupMerge configuration variable is true. -l:: Create the new branch's reflog; see linkgit:git-branch[1] for @@ -210,7 +210,7 @@ the conflicted merge in the specified paths. --conflict=<style>:: 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). |