summaryrefslogtreecommitdiffstats
path: root/git-pull.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-03-25 17:26:23 -0700
committerJunio C Hamano <gitster@pobox.com>2024-03-25 17:26:23 -0700
commit8842ccc9dc941b70fd8eccbfcd41acac8627f67f (patch)
tree96a88c84fcd5e6707814050b8c611f3cfe07cbae /git-pull.txt
parentfd4c4dc9f73ff03dad1eb33a5ec51e32dfcb2b4b (diff)
downloadgit-htmldocs-8842ccc9dc941b70fd8eccbfcd41acac8627f67f.tar.gz
Autogenerated HTML docs for v2.44.0-368-gc75fd
Diffstat (limited to 'git-pull.txt')
-rw-r--r--git-pull.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-pull.txt b/git-pull.txt
index 0e14f8b5b..b2ae496e4 100644
--- a/git-pull.txt
+++ b/git-pull.txt
@@ -87,7 +87,7 @@ OPTIONS
--verbose::
Pass --verbose to git-fetch and git-merge.
---[no-]recurse-submodules[=yes|on-demand|no]::
+--[no-]recurse-submodules[=(yes|on-demand|no)]::
This option controls if new commits of populated submodules should
be fetched, and if the working trees of active submodules should be
updated, too (see linkgit:git-fetch[1], linkgit:git-config[1] and
@@ -105,7 +105,7 @@ Options related to merging
include::merge-options.txt[]
-r::
---rebase[=false|true|merges|interactive]::
+--rebase[=(false|true|merges|interactive)]::
When true, rebase the current branch on top of the upstream
branch after fetching. If there is a remote-tracking branch
corresponding to the upstream branch and the upstream branch