Santi Béjar wrote: > On 1/2/07, Jakub Narebski <jnareb@xxxxxxxxx> wrote: >> Junio C Hamano wrote: >> >>> Obviously, the local names should matter more when you are doing >>> local operations. So if you are using mergeLocal to give a >>> shorthand to "git merge" that does not explicitly say what to >>> merge, the above discussion does not apply. But if that is the >>> case, mergeLocal should also not affect the selection of >>> branches to be merged when "git pull" happens from a remote >>> either. >> >> You can always use remote = ".", and then remote and local branches >> are the same... > > Currently it does not work. Fact. I remember that there was proposal of having branch.<name>.remote=. and branch.<name>.merge=<ref> to make "git pull" on branch <name> do "git pull . <ref>". There was some discussion about this; perhaps it was not accepted (or forgotten to be accepted after resolving discussion). -- Jakub Narebski Poland - 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