undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bw/push-submodule-only'

Browse Source 
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
This commit is contained in:
Junio C Hamano 2017-02-10 12:52:23 -08:00
commit 8e7c1f3240
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Documentation/git-push.txt
View File

@ -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. standard error stream is not directed to a terminal.
--no-recurse-submodules:: --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 May be used to make sure all submodule commits used by the
revisions to be pushed are available on a remote-tracking branch. revisions to be pushed are available on a remote-tracking branch.
If 'check' is used Git will verify that all submodule commits that 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 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 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 all submodules that changed in the revisions to be pushed will be
pushed. If on-demand was not able to push all necessary revisions pushed. If on-demand was not able to push all necessary revisions it will
it will also be aborted and exit with non-zero status. A value of also be aborted and exit with non-zero status. If 'only' is used all
'no' or using `--no-recurse-submodules` can be used to override the submodules will be recursively pushed while the superproject is left
push.recurseSubmodules configuration variable when no submodule unpushed. A value of 'no' or using `--no-recurse-submodules` can be used
recursion is required. to override the push.recurseSubmodules configuration variable when no
submodule recursion is required.
--[no-]verify:: --[no-]verify::
Toggle the pre-push hook (see linkgit:githooks[5]). The Toggle the pre-push hook (see linkgit:githooks[5]). The

2
contrib/completion/git-completion.bash
View File

@ -1674,7 +1674,7 @@ _git_pull ()
__git_complete_remote_or_refspec __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 () __git_complete_force_with_lease ()
{ {