From patchwork Fri Oct 18 20:59:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip Oakley X-Patchwork-Id: 11199673 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5AA0C14E5 for ; Fri, 18 Oct 2019 20:59:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 41AA92070B for ; Fri, 18 Oct 2019 20:59:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405871AbfJRU7n (ORCPT ); Fri, 18 Oct 2019 16:59:43 -0400 Received: from smtp-out-4.talktalk.net ([62.24.135.68]:4692 "EHLO smtp-out-4.talktalk.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732529AbfJRU7n (ORCPT ); Fri, 18 Oct 2019 16:59:43 -0400 Received: from localhost.localdomain ([92.30.121.54]) by smtp.talktalk.net with SMTP id LZLZijkPcnuQZLZLZirrs6; Fri, 18 Oct 2019 21:59:42 +0100 X-Originating-IP: [92.30.121.54] X-Spam: 0 X-OAuthority: v=2.3 cv=echDgIMH c=1 sm=1 tr=0 a=/cLN2YrzNMz5fcHgWq8JfQ==:117 a=/cLN2YrzNMz5fcHgWq8JfQ==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=ldyaYNNxDcoA:10 a=ZZnuYtJkoWoA:10 a=Y_rLTfa585dEHHUE3isA:9 a=pHzHmUro8NiASowvMSCR:22 a=Ew2E2A-JSTLzCXPT_086:22 From: Philip Oakley To: GitList , Junio C Hamano Cc: Philip Oakley Subject: [PATCH v2] config/branch: state that .merge is the remote ref Date: Fri, 18 Oct 2019 21:59:35 +0100 Message-Id: <20191018205935.2529-1-philipoakley@iee.email> X-Mailer: git-send-email 2.23.0.windows.1.21.g947f504ebe8.dirty In-Reply-To: References: MIME-Version: 1.0 X-CMAE-Envelope: MS4wfItmO0SYBQu/L0HOmPyiFrWNMWaV+csGpAw/wMA/6n896l43L71qfvtMbTUr9wHxs+BcCZuTsQvHkkOWK8l54lUMcl/rA2uuHDO34Mg9+aHLZ7dRpynS QATwqLV86tGg2jp0u6ByKvr9Gu5nzFsuznUm43lMb84ABMEPQRRQKKHQGqQaWTDcgd8QtKAY595uoynI5y0zezRl96k61a689IfSqXMZN3I8uivwiDKsIWAs kRqxY2dZRv+0ejAczClGaA== Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The branch..merge value typically looks just like a local ref. Tell the reader it is the ref name at the remote, which may be different. Signed-off-by: Philip Oakley --- Documentation/config/branch.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Documentation/config/branch.txt b/Documentation/config/branch.txt index a592d522a7..cdc19edaaf 100644 --- a/Documentation/config/branch.txt +++ b/Documentation/config/branch.txt @@ -52,8 +52,10 @@ branch..pushRemote:: option to override it for a specific branch. branch..merge:: - Defines, together with branch..remote, the upstream branch - for the given branch. It tells 'git fetch'/'git pull'/'git rebase' which + The name of the branch ref at the remote `branch..remote` + that is used as the upstream branch for the given branch . ++ + It tells 'git fetch'/'git pull'/'git rebase' which branch to merge and can also affect 'git push' (see push.default). When in branch , it tells 'git fetch' the default refspec to be marked for merging in FETCH_HEAD. The value is