summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Matthieu Moy <Matthieu.Moy@imag.fr>2012-04-24 09:50:05 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-04-24 15:22:17 -0700
commit67804c2731f9028ac246f7cea6fd9652386bab33 (patch)
tree74d982b807f984a8b7e0b018831024c4acb1d3f0 /Documentation
parentt5570: use explicit push refspec (diff)
downloadtgif-67804c2731f9028ac246f7cea6fd9652386bab33.tar.xz
push: document the future default change for push.default (matching -> simple)
It is too early to start warning loudly about the future default change in favor of 'simple', since many users use different versions of Git, and would be harmed if we advised them to explicitely set 'push.default=simple' when using old versions of Git. Still, we want to document the upcomming change so that: * Users who may be affected by the change get one more chance to know it in advance. * We actually commit to changing the default, and avoid repeating past errors. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt8
1 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 7f5ad1ce06..f724fc64b2 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1685,10 +1685,14 @@ push.default::
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.
+ if other users updated the branch.
+ +
+ This is currently the default, but Git 2.0 will change the default
+ to `simple`.
* `simple` - like `upstream`, but refuses to push if the upstream
branch's name is different from the local one. This is the safest
- option and is well-suited for beginners.
+ option and is well-suited for beginners. It will become the default
+ in Git 2.0.
* `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.