"Santi Béjar" <sbejar@xxxxxxxxx> writes: > On 2/3/07, Santi Béjar <sbejar@xxxxxxxxx> wrote: >> --- 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". > > It is OK, but ... Yeah, but I am starting to think that it was a mistake to allow an additional way to express the same thing. Reverting 80c797764 would make the implementation to match the specification described in the original. - 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