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>
Matthieu Moy committed
Apr 24, 2012 at 09:50 UTC
67804c2731f9028ac246f7cea6fd9652386bab33
1 file changed
+6
-2
Documentation/config.txt
+6
-2
@@ -1685,10 +1685,14 @@ push.default::
1685
shape and then push them out with a single command. It is not
1686
appropriate for pushing into a repository shared by multiple users,
1687
since locally stalled branches will attempt a non-fast forward push
1688
- if other users updated the branch. This is the default.
1688
+ if other users updated the branch.
1689
+ +
1690
+ This is currently the default, but Git 2.0 will change the default
1691
+ to `simple`.
1692
* `simple` - like `upstream`, but refuses to push if the upstream
1693
branch's name is different from the local one. This is the safest
1691
- option and is well-suited for beginners.
1694
+ option and is well-suited for beginners. It will become the default
1695
+ in Git 2.0.
1696
* `upstream` - push the current branch to its upstream branch.
1697
With this, `git push` will update the same remote ref as the one which
1698
is merged by `git pull`, making `push` and `pull` symmetrical.