summaryrefslogtreecommitdiffstats
path: root/man1/git-push.1
diff options
context:
space:
mode:
Diffstat (limited to 'man1/git-push.1')
-rw-r--r--man1/git-push.122
1 files changed, 10 insertions, 12 deletions
diff --git a/man1/git-push.1 b/man1/git-push.1
index 33eb0f039..d576272a4 100644
--- a/man1/git-push.1
+++ b/man1/git-push.1
@@ -2,12 +2,12 @@
.\" Title: git-push
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\" Date: 11/21/2022
+.\" Date: 11/23/2022
.\" Manual: Git Manual
-.\" Source: Git 2.38.1.473.ga0789512c5
+.\" Source: Git 2.39.0.rc0
.\" Language: English
.\"
-.TH "GIT\-PUSH" "1" "11/21/2022" "Git 2\&.38\&.1\&.473\&.ga07895" "Git Manual"
+.TH "GIT\-PUSH" "1" "11/23/2022" "Git 2\&.39\&.0\&.rc0" "Git Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -503,11 +503,16 @@ is used Git will verify that all submodule commits that changed in the revisions
\fIon\-demand\fR
is used all submodules that changed in the revisions to be pushed will be pushed\&. If on\-demand was not able to push all necessary revisions it will also be aborted and exit with non\-zero status\&. If
\fIonly\fR
-is used all submodules will be recursively pushed while the superproject is left unpushed\&. A value of
+is used all submodules will be pushed while the superproject is left unpushed\&. A value of
\fIno\fR
or using
\fB\-\-no\-recurse\-submodules\fR
can be used to override the push\&.recurseSubmodules configuration variable when no submodule recursion is required\&.
+.sp
+When using
+\fIon\-demand\fR
+or
+\fIonly\fR, if a submodule has a "push\&.recurseSubmodules={on\-demand,only}" or "submodule\&.recurse" configuration, further recursion will occur\&. In this case, "only" is treated as "on\-demand"\&.
.RE
.PP
\-\-[no\-]verify
@@ -1418,14 +1423,7 @@ This will result in only b (a and c are cleared)\&.
.PP
push\&.recurseSubmodules
.RS 4
-Make sure all submodule commits used by the revisions to be pushed are available on a remote\-tracking branch\&. If the value is
-\fIcheck\fR
-then Git will verify that all submodule commits that changed in the revisions to be pushed are available on at least one remote of the submodule\&. If any commits are missing, the push will be aborted and exit with non\-zero status\&. If the value is
-\fIon\-demand\fR
-then all submodules that changed in the revisions to be pushed will be pushed\&. If on\-demand was not able to push all necessary revisions it will also be aborted and exit with non\-zero status\&. If the value is
-\fIno\fR
-then default behavior of ignoring submodules when pushing is retained\&. You may override this configuration at time of push by specifying
-\fI\-\-recurse\-submodules=check|on\-demand|no\fR\&. If not set,
+May be "check", "on\-demand", "only", or "no", with the same behavior as that of "push \-\-recurse\-submodules"\&. If not set,
\fIno\fR
is used by default, unless
\fIsubmodule\&.recurse\fR