From: Matthieu Moy Date: Tue, 09 Nov 2010 20:19:27 GMT Subject: Re: What's cooking in git.git (Nov 2010, #01; Tue, 9) Message-ID: In-Reply-To: <7vbp5ymfyo.fsf@alter.siamese.dyndns.org> Junio C Hamano writes: > * mm/phrase-remote-tracking (2010-11-02) 10 commits > - git-branch.txt: mention --set-upstream as a way to change upstream configuration > - user-manual: remote-tracking can be checked out, with detached HEAD > - user-manual.txt: explain better the remote(-tracking) branch terms > - Change incorrect "remote branch" to "remote tracking branch" in C code > - Change incorrect uses of "remote branch" meaning "remote-tracking" > - Change "tracking branch" to "remote-tracking branch" > - everyday.txt: change "tracking branch" to "remote-tracking branch" > - Change remote tracking to remote-tracking in non-trivial places > - Replace "remote tracking" with "remote-tracking" > - Better "Changed but not updated" message in git-status > > Is everybody happy with this round? I'd prefer to merge it to 'next' or > even 'master' and have further polishing be done, if necessary, > in-tree. The version in pu is the right one (I have to admin I did not make the task easy ;-), thanks. I didn't get comment for a while, so I guess it's OK for next, or master if you want. -- Matthieu Moy http://www-verimag.imag.fr/~moy/