Signed-off-by: Santi Béjar <sbejar@xxxxxxxxx> --- 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.<name>.remote:: branch.<name>.merge:: When in branch <name>, 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.<name>.remote". + the remote or local part of one of the refspecs which are fetched + from the remote given by "branch.<name>.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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html