On Sat, Feb 03, 2007 at 04:29:40PM +0100, Santi Béjar wrote: > 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". Since both local and remote refs are allowed, it would be useful to know how git-fetch decides how to handle them. Looks like the 1st fetch refspec with that ref on either side is selected. git-parser-remote also looks branch.*.merge with --get-all, so it is interesting to know what happens for multiple values (if git-fetch just marks them all, how does git-pull react ?). That's also useful to know for porcelain writers wanting to parse FETCH_HEAD. Best regards, -- Yann. - 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