diff options
| author | Justin Lebar <jlebar@google.com> | 2014-03-31 22:11:46 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-31 22:29:27 (GMT) |
| commit | 01689909eb9f8366583c44b325d8d9ba259a2538 (patch) | |
| tree | 6a4635a267885b3429f55c81a9a1c8787e36802e /builtin/checkout.c | |
| parent | e34b272344c1e7eb640dcce5990a75460240daed (diff) | |
| download | git-01689909eb9f8366583c44b325d8d9ba259a2538.zip git-01689909eb9f8366583c44b325d8d9ba259a2538.tar.gz git-01689909eb9f8366583c44b325d8d9ba259a2538.tar.bz2 | |
comments: fix misuses of "nor"
Signed-off-by: Justin Lebar <jlebar@google.com>
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 ada51fa..7f37d1a 100644 --- 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. |