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@xxxxxxx> --- Documentation/config.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 88d739a..696544e 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1687,10 +1687,12 @@ push.default:: repository, but may give surprising results when used on a repository shared by multiple users, since locally stalled branches will attempt a non-fast forward push if other users - updated the branch remotely. This is the default. + updated the branch remotely. 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. See "branch.<name>.merge" for how to configure the upstream branch. This makes `git push` and `git pull` symmetrical in the sense that `push` -- 1.7.10.234.ge65dd.dirty -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html