diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-02-10 12:52:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-10 12:52:23 -0800 |
| commit | 8e7c1f3240d16d93f4f48c5c1ffa1d5a1f69b298 (patch) | |
| tree | 2992df74075375762aa638df50ac8700e8e1dd73 | |
| parent | 6e3a7b3398559305c7a239a42e447c21a8f39ff8 (diff) | |
| parent | 446624ce350b26e443bf5bfbe8512670853902bc (diff) | |
| download | git-8e7c1f3240d16d93f4f48c5c1ffa1d5a1f69b298.tar.gz | |
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
| -rw-r--r-- | Documentation/git-push.txt | 13 | ||||
| -rw-r--r-- | contrib/completion/git-completion.bash | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index 8eefabd0d1..1624a35888 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 diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 97d73ad88f..f0ce11296c 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1674,7 +1674,7 @@ _git_pull () __git_complete_remote_or_refspec } -__git_push_recurse_submodules="check on-demand" +__git_push_recurse_submodules="check on-demand only" __git_complete_force_with_lease () { |