From: Philip Oakley Date: Fri, 18 Oct 2019 20:59:35 GMT Subject: [PATCH v2] config/branch: state that .merge is the remote ref Message-ID: <20191018205935.2529-1-philipoakley@iee.email> In-Reply-To: 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 -- 2.23.0.windows.1.21.g947f504ebe8.dirty