On Sat, 2010-10-23 at 18:31 +0200, Matthieu Moy wrote: > Following the discussion in > > http://thread.gmane.org/gmane.comp.version-control.git/159287/ > http://thread.gmane.org/gmane.comp.version-control.git/159287/focus=159288 > > this is an attempt to be more consistant in the terminology used in Git. > > The first patch fixes git status's "changed but not updated", and the > rest tries to use "remote-tracking branch" consistantly. This > essentially changes the doc, and also does slight modifications to the > code. This changes error message, and maybe more controversially the > generated merge messages (in a separate patch in case this is too > controversial). > > I've tried splitting this into systematic changes to ease review, but > patches should be applicable in any order (i.e. Junio: if you find > some of the patches good and uncontroversial, you can pick them > right away). > > Patch "user-manual.txt: explain better the remote(-tracking) branch > terms" comes last, and adds a few sentences to make the distinction > between remote, remote branch, remote-tracking branches explicit. > Hopefully, this should avoid future users to have the same > difficulties as Thore ;-). > > The last 2 patches are minor things I noticed while going through the > docs, but are essentially unrelated. > > I'll be busy next week, so if anyone else wants to pick this patch > serie and update it according to list review, he's welcome. Otherwise, > it may have to wait. > > Matthieu Moy (11): > Better "Changed but not updated" message in git-status > Remplace "remote tracking" with "remote-tracking" > Change remote tracking to remote-tracking in non-trivial places > Change "tracking branch" to "remote-tracking branch" > Change "tracking branch" to "remote-tracking branch" in C code > Change incorrect uses of "remote branch" meaning "remote-tracking" > Change incorrect "remote branch" to "remote tracking branch" in C > code > Use 'remote-tracking branch' in generated merge messages > user-manual.txt: explain better the remote(-tracking) branch terms > git-branch.txt: mention --set-upstream as a way to change upstream > configuration > git-http-push.txt: fix typo (branch -> branches) I'm going to apply these to a branch of mine to see how they read in context before I come to any definite conclusions. So far I like what I see for the most part. -- -Drew Northup N1XIM AKA RvnPhnx on OPN ________________________________________________ "As opposed to vegetable or mineral error?" -John Pescatore, SANS NewsBites Vol. 12 Num. 59 -- 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