summaryrefslogtreecommitdiff
path: root/Documentation/git-push.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-04-24 14:40:20 -0700
committerJunio C Hamano <gitster@pobox.com>2012-04-24 14:40:20 -0700
commit419f2ecf7894726773f7ea5620741ce8ec60e553 (patch)
treed09b87885f64fa960dcb2cbb155da8354190f399 /Documentation/git-push.txt
parent8c3a534c506bceb4981266e0c5db2918bb067da8 (diff)
parenteb21c732d6b642a8f33abd69071a95de01d5061b (diff)
downloadgit-419f2ecf7894726773f7ea5620741ce8ec60e553.tar.gz
Merge branch 'hv/submodule-recurse-push'
"git push --recurse-submodules" learns to optionally look into the histories of submodules bound to the superproject and push them out. By Heiko Voigt * hv/submodule-recurse-push: push: teach --recurse-submodules the on-demand option Refactor submodule push check to use string list instead of integer Teach revision walking machinery to walk multiple times sequencially
Diffstat (limited to 'Documentation/git-push.txt')
-rw-r--r--Documentation/git-push.txt14
1 files changed, 10 insertions, 4 deletions
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 48760db337..a52b7b1a19 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -170,10 +170,16 @@ useful if you write an alias or script around 'git push'.
is specified. This flag forces progress status even if the
standard error stream is not directed to a terminal.
---recurse-submodules=check::
- Check whether all submodule commits used by the revisions to be
- pushed are available on a remote tracking branch. Otherwise the
- push will be aborted and the command will exit with non-zero status.
+--recurse-submodules=check|on-demand::
+ 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 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 '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.
include::urls-remotes.txt[]