summaryrefslogtreecommitdiff
path: root/Documentation/git-push.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-02-10 20:52:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-02-10 20:52:23 (GMT)
commit8e7c1f3240d16d93f4f48c5c1ffa1d5a1f69b298 (patch)
tree2992df74075375762aa638df50ac8700e8e1dd73 /Documentation/git-push.txt
parent6e3a7b3398559305c7a239a42e447c21a8f39ff8 (diff)
parent446624ce350b26e443bf5bfbe8512670853902bc (diff)
downloadgit-8e7c1f3240d16d93f4f48c5c1ffa1d5a1f69b298.zip
git-8e7c1f3240d16d93f4f48c5c1ffa1d5a1f69b298.tar.gz
git-8e7c1f3240d16d93f4f48c5c1ffa1d5a1f69b298.tar.bz2
Merge branch 'bw/push-submodule-only'
Add missing documentation update to a recent topic. * bw/push-submodule-only: completion: add completion for --recurse-submodules=only doc: add doc for git-push --recurse-submodules=only
Diffstat (limited to 'Documentation/git-push.txt')
-rw-r--r--Documentation/git-push.txt13
1 files changed, 7 insertions, 6 deletions
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 8eefabd..1624a35 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -272,7 +272,7 @@ origin +master` to force a push to the `master` branch). See the
standard error stream is not directed to a terminal.
--no-recurse-submodules::
---recurse-submodules=check|on-demand|no::
+--recurse-submodules=check|on-demand|only|no::
May be used to make sure all submodule commits used by the
revisions to be pushed are available on a remote-tracking branch.
If 'check' is used Git will verify that all submodule commits that
@@ -280,11 +280,12 @@ origin +master` to force a push to the `master` branch). See the
remote of the submodule. If any commits are missing the push will
be aborted and exit with non-zero status. If 'on-demand' 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. A value of
- 'no' or using `--no-recurse-submodules` can be used to override the
- push.recurseSubmodules configuration variable when no submodule
- recursion is required.
+ pushed. If on-demand was not able to push all necessary revisions it will
+ also be aborted and exit with non-zero status. If 'only' is used all
+ submodules will be recursively pushed while the superproject is left
+ unpushed. A value of 'no' or using `--no-recurse-submodules` can be used
+ to override the push.recurseSubmodules configuration variable when no
+ submodule recursion is required.
--[no-]verify::
Toggle the pre-push hook (see linkgit:githooks[5]). The