diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2010-11-02 16:31:23 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-03 09:20:41 -0700 |
| commit | 8b3f3f84b27e6bbac1b1558166b44431a8e78bb1 (patch) | |
| tree | ce61002777df7c0aa90570aa8fc1d7db5e7ffcc2 /Documentation/user-manual.txt | |
| parent | bc6dafc1445a9e04141ed6bf28326114bc2e9191 (diff) | |
| download | git-8b3f3f84b27e6bbac1b1558166b44431a8e78bb1.tar.gz git-8b3f3f84b27e6bbac1b1558166b44431a8e78bb1.tar.xz | |
Change "tracking branch" to "remote-tracking branch"
One more step towards consistancy. We change the documentation and the C
code in a single patch, since the only instances in the C code are in
comment and usage strings.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/user-manual.txt')
| -rw-r--r-- | Documentation/user-manual.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index d5505e880..d7835ca39 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -435,7 +435,7 @@ linux-nfs/master origin/master ------------------------------------------------- -If you run "git fetch <remote>" later, the tracking branches for the +If you run "git fetch <remote>" later, the remote-tracking branches for the named <remote> will be updated. If you examine the file .git/config, you will see that git has added |