From: Santi Béjar Date: Sat, 03 Feb 2007 15:29:40 GMT Subject: [PATCH] config.txt: update branch..merge documentation Message-ID: <87irejgsyj.fsf@gmail.com> Signed-off-by: Santi Béjar --- Documentation/config.txt | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index e5e019f..f129de9 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -233,11 +233,12 @@ branch..remote:: branch..merge:: When in branch , it tells `git fetch` the default refspec to be marked for merging in FETCH_HEAD. The value has exactly to match - a remote part of one of the refspecs which are fetched from the remote - given by "branch..remote". + the remote or local part of one of the refspecs which are fetched + from the remote given by "branch..remote". The merge information is used by `git pull` (which at first calls `git fetch`) to lookup the default branch for merging. Without - this option, `git pull` defaults to merge the first refspec fetched. + this option and when fetching a non default remote, `git pull` + defaults to merge the first refspec fetched. Specify multiple values to get an octopus merge. color.branch:: -- 1.5.0.rc2.579.g7df8