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) Documentation/config.txt | 13 ++++++----- Documentation/everyday.txt | 6 ++-- Documentation/fetch-options.txt | 2 +- Documentation/git-branch.txt | 14 +++++++----- Documentation/git-checkout.txt | 2 +- Documentation/git-clone.txt | 2 +- Documentation/git-describe.txt | 2 +- Documentation/git-fetch.txt | 2 +- Documentation/git-gc.txt | 6 ++-- Documentation/git-http-push.txt | 2 +- Documentation/git-log.txt | 2 +- Documentation/git-pull.txt | 8 +++--- Documentation/git-remote.txt | 6 ++-- Documentation/git-tag.txt | 4 +- Documentation/gittutorial-2.txt | 2 +- Documentation/gittutorial.txt | 6 ++-- Documentation/glossary-content.txt | 8 +++--- Documentation/rev-list-options.txt | 2 +- Documentation/user-manual.txt | 22 +++++++++++++++----- branch.h | 2 +- builtin/checkout.c | 4 +- builtin/fetch.c | 6 ++-- builtin/fmt-merge-msg.c | 6 ++-- builtin/merge.c | 2 +- builtin/remote.c | 6 ++-- contrib/examples/builtin-fetch--tool.c | 2 +- remote.c | 2 +- t/t1507-rev-parse-upstream.sh | 2 +- t/t3409-rebase-preserve-merges.sh | 2 +- t/t5400-send-pack.sh | 2 +- t/t5505-remote.sh | 6 ++-- t/t5513-fetch-track.sh | 2 +- t/t7508-status.sh | 34 ++++++++++++++++---------------- t/t7608-merge-messages.sh | 4 +- wt-status.c | 2 +- 35 files changed, 104 insertions(+), 91 deletions(-) -- 1.7.3.2.537.g7e355 -- 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