diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2010-11-02 16:31:20 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-03 09:19:04 -0700 |
| commit | 0e615b252f35006ea824fae1a95dc6af55326b9a (patch) | |
| tree | 81a66d2d1561c3310e4dd8cab7ac2869c3601371 /builtin/checkout.c | |
| parent | 8009d83c7e7af0a298ef858609a8201d01086396 (diff) | |
| download | git-0e615b252f35006ea824fae1a95dc6af55326b9a.tar.gz git-0e615b252f35006ea824fae1a95dc6af55326b9a.tar.xz | |
Replace "remote tracking" with "remote-tracking"
"remote-tracking" branch makes it explicit that the branch is "tracking a
remote", as opposed to "remote, and tracking something".
See discussion in e.g.
http://mid.gmane.org/8835ADF9-45E5-4A26-9F7F-A72ECC065BB2@gmail.com
for more details.
This patch is a straightforward application of
perl -pi -e 's/remote tracking branch/remote-tracking branch/'
except in the RelNotes directory.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 9240fafb2..9a934af74 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -786,7 +786,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix) * With no paths, if <something> is _not_ a commit, no -t nor -b * was given, and there is a 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. + * to fork local <something> from that remote-tracking branch. * * Otherwise <something> shall not be ambiguous. * - If it's *only* a reference, treat it like case (1). |