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 | |
| 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')
| -rw-r--r-- | builtin/apply.c | 2 | ||||
| -rw-r--r-- | builtin/checkout.c | 2 | ||||
| -rw-r--r-- | builtin/log.c | 2 | ||||
| -rw-r--r-- | builtin/pack-objects.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/builtin/apply.c b/builtin/apply.c index b0d0986..6013e19 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -4061,7 +4061,7 @@ static int write_out_one_reject(struct patch *patch) return error(_("cannot open %s: %s"), namebuf, strerror(errno)); /* Normal git tools never deal with .rej, so do not pretend - * this is a git patch by saying --git nor give extended + * this is a git patch by saying --git or giving extended * headers. While at it, maybe please "kompare" that wants * the trailing TAB and some garbage at the end of line ;-). */ 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. diff --git a/builtin/log.c b/builtin/log.c index b97373d..39e8836 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -503,7 +503,7 @@ static void show_rev_tweak_rev(struct rev_info *rev, struct setup_revision_opt * /* There was no "-m" on the command line */ rev->ignore_merges = 0; if (!rev->first_parent_only && !rev->combine_merges) { - /* No "--first-parent", "-c", nor "--cc" */ + /* No "--first-parent", "-c", or "--cc" */ rev->combine_merges = 1; rev->dense_combined_merges = 1; } diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 541667f..ef1f20e 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -999,7 +999,7 @@ static int pbase_tree_cache_ix_incr(int ix) static struct pbase_tree { struct pbase_tree *next; /* This is a phony "cache" entry; we are not - * going to evict it nor find it through _get() + * going to evict it or find it through _get() * mechanism -- this is for the toplevel node that * would almost always change with any commit. */ |