On 2008.10.27 11:43:44 -0400, Marc Branchaud wrote: > Michael J Gruber wrote: >> >> remote tracking branch: Synonymous with tracking branch. [remote is a >> noun, an object for track here] > > Er, "remote" is an adjective there... :) Hm? It's a "branch that tracks (a branch of) a remote". Looks like a noun to me. >> [adjective to be found] branch: A local branch which is set up to pull >> or rebase automatically from a tracking branch. Used for local >> modifications to remote branches. [I'm tempted to use local tracking >> branch here, but that would just add to the confusion.] > > I say there's no need for an adjective here, as this is just a plain old > branch that git-branch creates by default (right?). By default, no. It depends on the branch.automergesetup configuration and whether you create the branch from a remote tracking branch, a local branch or some other committish. autosetupmerge = false ---- git branch foo origin/foo --> --no-track git branch foo master --> --no-track git branch foo origin/foo^0 --> --no-track autosetupmerge = true ---- git branch foo origin/foo --> --track git branch foo master --> --no-track git branch foo origin/foo^0 --> --no-track autosetupmerge = always ---- git branch foo origin/foo --> --track git branch foo master --> --track git branch foo origin/foo^0 --> --no-track > What's needed is an adjective for when git-branch is given the > --no-track option (or when branch.automergesetup is false). > "Non-tracking branch" perhaps? Isn't that easily confused with "[remote] tracking branch"? Especially since the "remote" is optional... Björn -- 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
