Merge branch 'mm/phrase-remote-tracking'

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 9240fafb2ad17505bf407363e058d208a8a70497..1fa9ce43f548da542ec2e93c8d75fdd3d78131b2 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -784,9 +784,9 @@ 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.
+        *   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).