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 /builtin | |
| 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 'builtin')
| -rw-r--r-- | builtin/checkout.c | 2 | ||||
| -rw-r--r-- | builtin/fetch.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 9a934af74..1fa9ce43f 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -784,7 +784,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix) * between A and B, A...B names that merge base. * * With no paths, if <something> is _not_ a commit, no -t nor -b - * was given, and there is a tracking branch whose name is + * was given, and there is a remote-tracking branch whose name is * <something> in one and only one remote, then this is a short-hand * to fork local <something> from that remote-tracking branch. * diff --git a/builtin/fetch.c b/builtin/fetch.c index d35f000c0..3b0b61437 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -52,7 +52,7 @@ static struct option builtin_fetch_options[] = { OPT_SET_INT('n', NULL, &tags, "do not fetch all tags (--no-tags)", TAGS_UNSET), OPT_BOOLEAN('p', "prune", &prune, - "prune tracking branches no longer on remote"), + "prune remote-tracking branches no longer on remote"), OPT_BOOLEAN(0, "dry-run", &dry_run, "dry run"), OPT_BOOLEAN('k', "keep", &keep, "keep downloaded pack"), @@ -98,7 +98,7 @@ static void add_merge_config(struct ref **head, continue; /* - * Not fetched to a tracking branch? We need to fetch + * Not fetched to a remote-tracking branch? We need to fetch * it anyway to allow this branch's "branch.$name.merge" * to be honored by 'git pull', but we do not have to * fail if branch.$name.merge is misconfigured to point |