The documentation for the command said that `push.default` is the default without referring to the releavant manual page.
Now `simple` is the default behaviour. Document it right there where we say we take the default value from `push.default`, and remove the description of old default being 'matching'. Also reword cryptic desription of `--all`. Signed-off-by: Junio C Hamano <gits...@pobox.com> --- * I skimmed our two tutorials, just to be sure, but they do not discuss 'git push', so there was nothing to update there. I *think* we are minimally ready to switch the default behaviour now, but there may be other places that need similar adjustment. An independent audit is highly appreciated. Documentation/git-push.txt | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index 8b637d3..f326afb 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -36,10 +36,14 @@ OPTIONS[[OPTIONS]] The format of a <refspec> parameter is an optional plus `+`, followed by the source ref <src>, followed by a colon `:`, followed by the destination ref <dst>. - It is used to specify with what <src> object the <dst> ref - in the remote repository is to be updated. If not specified, + It is used to specify what <src> object the <dst> ref + in the remote repository is to be updated to. If no + <refspec> is specified on the command line, and if no + <refspec> is configured for the <repository>, the behavior of the command is controlled by the `push.default` - configuration variable. + configuration variable, and if it is unset, the `simple` + behaviour is used (see lingit:git-config and look + for `push.default`). + The <src> is often the name of the branch you would want to push, but it can be any arbitrary "SHA-1 expression", such as `master~4` or @@ -65,14 +69,11 @@ the remote repository. The special refspec `:` (or `+:` to allow non-fast-forward updates) directs git to push "matching" branches: for every branch that exists on the local side, the remote side is updated if a branch of the same name -already exists on the remote side. This is the default operation mode -if no explicit refspec is found (that is neither on the command line -nor in any Push line of the corresponding remotes file---see below) and -no `push.default` configuration variable is set. +already exists on the remote side. --all:: - Instead of naming each ref to push, specifies that all - refs under `refs/heads/` be pushed. + Push all branches (i.e. refs under `refs/heads/`); cannot be + used with other <refspec>. --prune:: Remove remote branches that don't have a local counterpart. For example -- 22.214.171.1247.ga1ba510 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html