summaryrefslogtreecommitdiffstats
path: root/man1/git-pull.1
diff options
context:
space:
mode:
Diffstat (limited to 'man1/git-pull.1')
-rw-r--r--man1/git-pull.110
1 files changed, 5 insertions, 5 deletions
diff --git a/man1/git-pull.1 b/man1/git-pull.1
index 8ef547d46..eee7046d2 100644
--- a/man1/git-pull.1
+++ b/man1/git-pull.1
@@ -2,12 +2,12 @@
.\" Title: git-pull
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\" Date: 2024-03-21
+.\" Date: 2024-03-25
.\" Manual: Git Manual
-.\" Source: Git 2.44.0.325.g11c821f2f2
+.\" Source: Git 2.44.0.368.gc75fd8d815
.\" Language: English
.\"
-.TH "GIT\-PULL" "1" "2024\-03\-21" "Git 2\&.44\&.0\&.325\&.g11c821" "Git Manual"
+.TH "GIT\-PULL" "1" "2024\-03\-25" "Git 2\&.44\&.0\&.368\&.gc75fd8" "Git Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -94,7 +94,7 @@ This is passed to both underlying git\-fetch to squelch reporting of during tran
Pass \-\-verbose to git\-fetch and git\-merge\&.
.RE
.PP
-\-\-[no\-]recurse\-submodules[=yes|on\-demand|no]
+\-\-[no\-]recurse\-submodules[=(yes|on\-demand|no)]
.RS 4
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
\fBgit-fetch\fR(1),
@@ -270,7 +270,7 @@ command refuses to merge histories that do not share a common ancestor\&. This o
Only useful when merging\&.
.RE
.PP
-\-r, \-\-rebase[=false|true|merges|interactive]
+\-r, \-\-rebase[=(false|true|merges|interactive)]
.RS 4
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 was rebased since last fetched, the rebase uses that information to avoid rebasing non\-local changes\&.
.sp