diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2012-04-24 09:50:00 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-24 12:11:58 -0700 |
| commit | 185c0874b1adea696b47d2fb78aca9a282a86abb (patch) | |
| tree | 5521a8e341ca7e51028d35ec01ded2daf97fce90 /Documentation/config.txt | |
| parent | d1ca788fcd34962a65924843ef1d0c773d565030 (diff) | |
| download | git-185c0874b1adea696b47d2fb78aca9a282a86abb.tar.gz git-185c0874b1adea696b47d2fb78aca9a282a86abb.tar.xz | |
Documentation: explain push.default option a bit more
The previous documentation was explaining _what_ the options were doing,
but were of little help explaining _why_ a user should set his default to
either of the options.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index fb386abc5..5f14871d2 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1680,12 +1680,24 @@ push.default:: line. Possible values are: + * `nothing` - do not push anything. -* `matching` - push all matching branches. - All branches having the same name in both ends are considered to be - matching. This is the default. +* `matching` - push all branches having the same name in both ends. + This is for those who prepare all the branches into a publishable + shape and then push them out with a single command. It is not + appropriate for pushing into a repository shared by multiple users, + since locally stalled branches will attempt a non-fast forward push + if other users updated the branch. This is the default. * `upstream` - push the current branch to its upstream branch. + With this, `git push` will update the same remote ref as the one which + is merged by `git pull`, making `push` and `pull` symmetrical. + See "branch.<name>.merge" for how to configure the upstream branch. * `tracking` - deprecated synonym for `upstream`. * `current` - push the current branch to a branch of the same name. + + + The `current` and `upstream` modes are for those who want to + push out a single branch after finishing work, even when the other + branches are not yet ready to be pushed out. If you are working with + other people to push into the same shared repository, you would want + to use one of these. rebase.stat:: Whether to show a diffstat of what changed upstream since the last |