From 76d3cc50b518d1c28d802ad2917063d8a5d34419 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Santi=20B=C3=A9jar?= Date: Mon, 30 Mar 2009 12:11:40 +0200 Subject: [PATCH] Documentation: enhance branch..{remote,merge} MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The documentation for branch.*.merge is very dense, so add a simple explanation on top of it. And branch.*.remote also affects 'git push'. Signed-off-by: Santi Béjar Signed-off-by: Junio C Hamano --- Documentation/config.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 750675530c..a6fc8da0bf 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -473,10 +473,14 @@ branch.autosetuprebase:: This option defaults to never. 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 from/push to. It defaults to `origin` if no remote is + configured. `origin` is also used if you are not on any branch. branch..merge:: + Defines, together with branch..remote, the upstream branch + for the given branch. It tells 'git-fetch'/'git-pull' which + branch to merge from. 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 -- 2.11.4.GIT