From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthieu Moy Subject: [PATCH 6/7] push: document the future default change for push.default (matching -> simple) Date: Tue, 24 Apr 2012 09:50:05 +0200 Message-ID: <1335253806-9059-7-git-send-email-Matthieu.Moy@imag.fr> References: <1335170284-30768-1-git-send-email-Matthieu.Moy@imag.fr> <1335253806-9059-1-git-send-email-Matthieu.Moy@imag.fr> Cc: Jeff King , Michael Haggerty , Matthieu Moy To: git@vger.kernel.org, gitster@pobox.com X-From: git-owner@vger.kernel.org Tue Apr 24 09:51:16 2012 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SMaWo-0001zZ-0L for gcvg-git-2@plane.gmane.org; Tue, 24 Apr 2012 09:51:14 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755054Ab2DXHvI (ORCPT ); Tue, 24 Apr 2012 03:51:08 -0400 Received: from mx1.imag.fr ([129.88.30.5]:46954 "EHLO shiva.imag.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754399Ab2DXHvH (ORCPT ); Tue, 24 Apr 2012 03:51:07 -0400 Received: from mail-veri.imag.fr (mail-veri.imag.fr [129.88.43.52]) by shiva.imag.fr (8.13.8/8.13.8) with ESMTP id q3O7i4KQ023598 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); Tue, 24 Apr 2012 09:44:06 +0200 Received: from bauges.imag.fr ([129.88.7.32]) by mail-veri.imag.fr with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1SMaW9-0007Ja-AU; Tue, 24 Apr 2012 09:50:33 +0200 Received: from moy by bauges.imag.fr with local (Exim 4.72) (envelope-from ) id 1SMaW9-0002Nm-8l; Tue, 24 Apr 2012 09:50:33 +0200 X-Mailer: git-send-email 1.7.10.234.g365b0 In-Reply-To: <1335253806-9059-1-git-send-email-Matthieu.Moy@imag.fr> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0.1 (shiva.imag.fr [129.88.30.5]); Tue, 24 Apr 2012 09:44:07 +0200 (CEST) X-IMAG-MailScanner-Information: Please contact MI2S MIM for more information X-MailScanner-ID: q3O7i4KQ023598 X-IMAG-MailScanner: Found to be clean X-IMAG-MailScanner-SpamCheck: X-IMAG-MailScanner-From: moy@imag.fr MailScanner-NULL-Check: 1335858250.88931@06ottRNTw3T7h/rzsbqRPw Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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 --- Documentation/config.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 7f5ad1c..f724fc6 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. -- 1.7.10.234.g365b0