summaryrefslogtreecommitdiff
path: root/Documentation/git-switch.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/git-switch.txt')
-rw-r--r--Documentation/git-switch.txt7
1 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/git-switch.txt b/Documentation/git-switch.txt
index 197900363b..5c438cd505 100644
--- a/Documentation/git-switch.txt
+++ b/Documentation/git-switch.txt
@@ -103,6 +103,9 @@ ambiguous but exists on the 'origin' remote. See also
`checkout.defaultRemote` in linkgit:git-config[1].
+
`--guess` is the default behavior. Use `--no-guess` to disable it.
++
+The default behavior can be set via the `checkout.guess` configuration
+variable.
-f::
--force::
@@ -181,9 +184,9 @@ name, the guessing is aborted. You can explicitly give a name with
--recurse-submodules::
--no-recurse-submodules::
Using `--recurse-submodules` will update the content of all
- initialized submodules according to the commit recorded in the
+ active submodules according to the commit recorded in the
superproject. If nothing (or `--no-recurse-submodules`) is
- used, the work trees of submodules will not be updated. Just
+ used, submodules working trees will not be updated. Just
like linkgit:git-submodule[1], this will detach `HEAD` of the
submodules.