aboutsummaryrefslogtreecommitdiff
path: root/remote.c
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2010-11-02 16:31:23 +0100
committerJunio C Hamano <gitster@pobox.com>2010-11-03 09:20:41 -0700
commit8b3f3f84b27e6bbac1b1558166b44431a8e78bb1 (patch)
treece61002777df7c0aa90570aa8fc1d7db5e7ffcc2 /remote.c
parentbc6dafc1445a9e04141ed6bf28326114bc2e9191 (diff)
downloadgit-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 'remote.c')
-rw-r--r--remote.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/remote.c b/remote.c
index 9143ec7a1..ca42a126a 100644
--- a/remote.c
+++ b/remote.c
@@ -493,7 +493,7 @@ static void read_config(void)
}
/*
- * We need to make sure the tracking branches are well formed, but a
+ * We need to make sure the remote-tracking branches are well formed, but a
* wildcard refspec in "struct refspec" must have a trailing slash. We
* temporarily drop the trailing '/' while calling check_ref_format(),
* and put it back. The caller knows that a CHECK_REF_FORMAT_ONELEVEL