2009/3/29 Jay Soffian <jaysoffian@xxxxxxxxx>: > On Sat, Mar 28, 2009 at 7:10 PM, Santi Béjar <santi@xxxxxxxxxxx> wrote: >> branch.<name>.merge:: >> + It defines, together with branch.<name>.remote, the tracking branch >> + for the current branch. It tells 'git-fetch'/'git-pull' which >> + branch to merge. > > I think it would be clearer to say "the upstream branch for the > current branch", since > it could very well be a local branch, not necessarily a remote tracking branch. It makes sense, thanks. Santi -- 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
