aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-push.txt
diff options
context:
space:
mode:
authorFredrik Gustafsson <iveqy@iveqy.com>2011-08-20 00:08:47 +0200
committerJunio C Hamano <gitster@pobox.com>2011-08-20 23:03:52 -0700
commitd2b17b3220cbd75b1c8e2aa6cfdc5c121749c97d (patch)
tree730f2d49512177c59d02ce03666d727b2d88dbd6 /Documentation/git-push.txt
parent25e5e2bf85c8a2c2c8945935267539940c11020d (diff)
downloadgit-d2b17b3220cbd75b1c8e2aa6cfdc5c121749c97d.tar.gz
git-d2b17b3220cbd75b1c8e2aa6cfdc5c121749c97d.tar.xz
push: Don't push a repository with unpushed submodules
When working with submodules it is easy to forget to push a submodule to the server but pushing a super-project that contains a commit for that submodule. The result is that the superproject points at a submodule commit that is not available on the server. This adds the option --recurse-submodules=check to push. When using this option git will check that all submodule commits that are about to be pushed are present on a remote of the submodule. To be able to use a combined diff, disabling a diff callback has been removed from combined-diff.c. Signed-off-by: Fredrik Gustafsson <iveqy@iveqy.com> Mentored-by: Jens Lehmann <Jens.Lehmann@web.de> Mentored-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-push.txt')
-rw-r--r--Documentation/git-push.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 88acfcd4c..6ae6ba3c2 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -162,6 +162,12 @@ 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.
+
+
include::urls-remotes.txt[]
OUTPUT