Merge branch 'jc/apply-ignore-whitespace' into maint

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 5b07757d4fca1950e293edf4a1183e5f79a72a2f..07cf55530918e8de6ae45e1c9b7e16707c32f844 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -895,7 +895,7 @@ static int parse_branchname_arg(int argc, const char **argv,
         *       between A and B, A...B names that merge base.
         *
         *   (b) If <something> is _not_ a commit, either "--" is present
-        *       or <something> is not a path, no -t nor -b was given, and
+        *       or <something> is not a path, no -t or -b was given, and
         *       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.