From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?utf-8?q?Santi=20B=C3=A9jar?= Subject: [PATCHv2 1/4] Documentation: enhance branch..{remote,merge} Date: Mon, 30 Mar 2009 12:11:40 +0200 Message-ID: <1238407903-28020-2-git-send-email-santi@agolina.net> References: <1238407903-28020-1-git-send-email-santi@agolina.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Mon Mar 30 12:15:02 2009 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1LoEVz-0007Mz-QW for gcvg-git-2@gmane.org; Mon, 30 Mar 2009 12:14:48 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758470AbZC3KMG convert rfc822-to-quoted-printable (ORCPT ); Mon, 30 Mar 2009 06:12:06 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758205AbZC3KME (ORCPT ); Mon, 30 Mar 2009 06:12:04 -0400 Received: from mail-fx0-f158.google.com ([209.85.220.158]:57772 "EHLO mail-fx0-f158.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758286AbZC3KMD (ORCPT ); Mon, 30 Mar 2009 06:12:03 -0400 Received: by fxm2 with SMTP id 2so1882493fxm.37 for ; Mon, 30 Mar 2009 03:11:59 -0700 (PDT) Received: by 10.223.111.71 with SMTP id r7mr3772192fap.59.1238407919583; Mon, 30 Mar 2009 03:11:59 -0700 (PDT) Received: from localhost (p5B0D60BE.dip.t-dialin.net [91.13.96.190]) by mx.google.com with ESMTPS id b17sm2246913fka.4.2009.03.30.03.11.58 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 30 Mar 2009 03:11:59 -0700 (PDT) X-Mailer: git-send-email 1.6.1.258.g7ff14 In-Reply-To: <1238407903-28020-1-git-send-email-santi@agolina.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: The documentation for branch.*.merge is very dense, so add a simple explanation on top of it. And branch.*.remote also afects 'git push'. Text taken from 'push.default'. Signed-off-by: Santi B=C3=A9jar --- Documentation/config.txt | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 089569a..fa2595b 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -473,10 +473,14 @@ branch.autosetuprebase:: This option defaults to never. =20 branch..remote:: - When in branch , it tells 'git-fetch' which remote to fetch. - If this option is not given, 'git-fetch' defaults to remote "origin". + When in branch , it tells 'git-fetch' and 'git-push' which + remote to fetch/push, and defaults to `origin` if no remote is + configured. `origin` is also used if you are not on any branch. =20 branch..merge:: + It defines, together with branch..remote, the upstream branch + for the given branch. It tells 'git-fetch'/'git-pull' which + branch to merge. When in branch , it tells 'git-fetch' the default refspec to be marked for merging in FETCH_HEAD. The value is handled like the remote part of a refspec, and must match a --=20 1.6.1.258.g7ff14