01689909eb · matheusbsbs/matheus-bagliano

Makefile

+1 -1

@@ -159,7 +159,7 @@ all::

159 #

160 # Define NEEDS_LIBINTL_BEFORE_LIBICONV if you need libintl before libiconv.

161 #

162 -# Define NO_INTPTR_T if you don't have intptr_t nor uintptr_t.

162 +# Define NO_INTPTR_T if you don't have intptr_t or uintptr_t.

163 #

164 # Define NO_UINTMAX_T if you don't have uintmax_t.

165 #

builtin/apply.c

+1 -1

@@ -4061,7 +4061,7 @@ static int write_out_one_reject(struct patch *patch)

4061 return error(_("cannot open %s: %s"), namebuf, strerror(errno));

4062

4063 /* Normal git tools never deal with .rej, so do not pretend

4064 - * this is a git patch by saying --git nor give extended

4064 + * this is a git patch by saying --git or giving extended

4065 * headers. While at it, maybe please "kompare" that wants

4066 * the trailing TAB and some garbage at the end of line ;-).

4067 */

builtin/checkout.c

+1 -1

@@ -895,7 +895,7 @@ static int parse_branchname_arg(int argc, const char **argv,

895 * between A and B, A...B names that merge base.

896 *

897 * (b) If <something> is _not_ a commit, either "--" is present

898 - * or <something> is not a path, no -t nor -b was given, and

898 + * or <something> is not a path, no -t or -b was given, and

899 * and there is a tracking branch whose name is <something>

900 * in one and only one remote, then this is a short-hand to

901 * fork local <something> from that remote-tracking branch.

builtin/log.c

+1 -1

@@ -503,7 +503,7 @@ static void show_rev_tweak_rev(struct rev_info *rev, struct setup_revision_opt *

503 /* There was no "-m" on the command line */

504 rev->ignore_merges = 0;

505 if (!rev->first_parent_only && !rev->combine_merges) {

506 - /* No "--first-parent", "-c", nor "--cc" */

506 + /* No "--first-parent", "-c", or "--cc" */

507 rev->combine_merges = 1;

508 rev->dense_combined_merges = 1;

509 }

builtin/pack-objects.c

+1 -1

@@ -999,7 +999,7 @@ static int pbase_tree_cache_ix_incr(int ix)

999 static struct pbase_tree {

1000 struct pbase_tree *next;

1001 /* This is a phony "cache" entry; we are not

1002 - * going to evict it nor find it through _get()

1002 + * going to evict it or find it through _get()

1003 * mechanism -- this is for the toplevel node that

1004 * would almost always change with any commit.

1005 */

column.c

+2 -2

@@ -311,8 +311,8 @@ static int parse_config(unsigned int *colopts, const char *value)

311 value += strspn(value, sep);

312 }

313 /*

314 - * Setting layout implies "always" if neither always, never

315 - * nor auto is specified.

314 + * If none of "always", "never", and "auto" is specified, then setting

315 + * layout implies "always".

316 *

317 * Current value in COL_ENABLE_MASK is disregarded. This means if

318 * you set column.ui = auto and pass --column=row, then "auto"

contrib/examples/git-checkout.sh

+1 -1

@@ -168,7 +168,7 @@ cd_to_toplevel

168 # branch. However, if "git checkout HEAD" detaches the HEAD

169 # from the current branch, even though that may be logically

170 # correct, it feels somewhat funny. More importantly, we do not

171 -# want "git checkout" nor "git checkout -f" to detach HEAD.

171 +# want "git checkout" or "git checkout -f" to detach HEAD.

172

173 detached=

174 detach_warn=

contrib/examples/git-reset.sh

+2 -2

@@ -40,7 +40,7 @@ case "$1" in --) shift ;; esac

40

41 # git reset --mixed tree [--] paths... can be used to

42 # load chosen paths from the tree into the index without

43 -# affecting the working tree nor HEAD.

43 +# affecting the working tree or HEAD.

44 if test $# != 0

45 then

46 test "$reset_type" = "--mixed" ||

@@ -60,7 +60,7 @@ then

60 update=-u

61 fi

62

63 -# Soft reset does not touch the index file nor the working tree

63 +# Soft reset does not touch the index file or the working tree

64 # at all, but requires them in a good order. Other resets reset

65 # the index file to the tree object we are switching to.

66 if test "$reset_type" = "--soft"

contrib/fast-import/import-directories.perl

+2 -2

@@ -109,8 +109,8 @@ was available previously is not included in this revision, it will

109 be removed.

110

111 If an on-disk revision is incomplete, you can point to files from

112 -a previous revision. There are no restriction as to where the source

113 -files are located, nor to the names of them.

112 +a previous revision. There are no restrictions on where the source

113 +files are located, nor on their names.

114

115 [3.files]

116 ; the key is the path inside the repository, the value is the path

delta.h

+1 -1

@@ -9,7 +9,7 @@ struct delta_index;

9 *

10 * This returns a pointer to a struct delta_index that should be passed to

11 * subsequent create_delta() calls, or to free_delta_index(). A NULL pointer

12 - * is returned on failure. The given buffer must not be freed nor altered

12 + * is returned on failure. The given buffer must not be freed or altered

13 * before free_delta_index() is called. The returned pointer must be freed

14 * using free_delta_index().

15 */

diff.c

+1 -1

@@ -3942,7 +3942,7 @@ static int diff_scoreopt_parse(const char *opt)

3942 }

3943 }

3944 if (cmd != 'M' && cmd != 'C' && cmd != 'B')

3945 - return -1; /* that is not a -M, -C nor -B option */

3945 + return -1; /* that is not a -M, -C, or -B option */

3946

3947 opt1 = parse_rename_score(&opt);

3948 if (cmd != 'B')

git-am.sh

+1 -1

@@ -523,7 +523,7 @@ Use \"git am --abort\" to remove it.")"

523 esac

524 fi

525

526 - # Make sure we are not given --skip, --continue, nor --abort

526 + # Make sure we are not given --skip, --continue, or --abort

527 test "$skip$resolved$abort" = "" ||

528 die "$(gettext "Resolve operation not in progress, we are not resuming.")"

529

gitweb/gitweb.perl

+1 -1

@@ -1490,7 +1490,7 @@ sub is_valid_pathname {

1490 my $input = shift;

1491

1492 return undef unless defined $input;

1493 - # no '.' or '..' as elements of path, i.e. no '.' nor '..'

1493 + # no '.' or '..' as elements of path, i.e. no '.' or '..'

1494 # at the beginning, at the end, and between slashes.

1495 # also this catches doubled slashes

1496 if ($input =~ m!(^|/)(|\.|\.\.)(/|$)!) {

http.h

+1 -2

@@ -13,8 +13,7 @@

13 /*

14 * We detect based on the cURL version if multi-transfer is

15 * usable in this implementation and define this symbol accordingly.

16 - * This is not something Makefile should set nor users should pass

17 - * via CFLAGS.

16 + * This shouldn't be set by the Makefile or by the user (e.g. via CFLAGS).

17 */

18 #undef USE_CURL_MULTI

19

perl/Git/SVN.pm

+1 -1

@@ -1191,7 +1191,7 @@ sub do_fetch {

1191 # we can have a branch that was deleted, then re-added

1192 # under the same name but copied from another path, in

1193 # which case we'll have multiple parents (we don't

1194 - # want to break the original ref, nor lose copypath info):

1194 + # want to break the original ref or lose copypath info):

1195 if (my $log_entry = $self->find_parent_branch($paths, $rev)) {

1196 push @{$log_entry->{parents}}, $lc;

1197 return $log_entry;

perl/Git/SVN/Migration.pm

+1 -1

@@ -1,6 +1,6 @@

1 package Git::SVN::Migration;

2 # these version numbers do NOT correspond to actual version numbers

3 -# of git nor git-svn. They are just relative.

3 +# of git or git-svn. They are just relative.

4 #

5 # v0 layout: .git/$id/info/url, refs/heads/$id-HEAD

6 #

pkt-line.h

+4 -4

@@ -28,10 +28,10 @@ void packet_buf_write(struct strbuf *buf, const char *fmt, ...) __attribute__((f

28 * Read a packetized line into the buffer, which must be at least size bytes

29 * long. The return value specifies the number of bytes read into the buffer.

30 *

31 - * If src_buffer is not NULL (and nor is *src_buffer), it should point to a

32 - * buffer containing the packet data to parse, of at least *src_len bytes.

33 - * After the function returns, src_buf will be incremented and src_len

34 - * decremented by the number of bytes consumed.

31 + * If src_buffer and *src_buffer are not NULL, it should point to a buffer

32 + * containing the packet data to parse, of at least *src_len bytes. After the

33 + * function returns, src_buf will be incremented and src_len decremented by the

34 + * number of bytes consumed.

35 *

36 * If src_buffer (or *src_buffer) is NULL, then data is read from the

37 * descriptor "fd".

remote.c

+1 -1

@@ -1409,7 +1409,7 @@ int match_push_refs(struct ref *src, struct ref **dst,

1409 /*

1410 * Remote doesn't have it, and we have no

1411 * explicit pattern, and we don't have

1412 - * --all nor --mirror.

1412 + * --all or --mirror.

1413 */

1414 goto free_name;

1415

sha1_file.c

+1 -1

@@ -787,7 +787,7 @@ void close_pack_index(struct packed_git *p)

787 * contain the same set of objects as an existing one. In that case

788 * the resulting file might be different even if its name would be the

789 * same. It is best to close any reference to the old pack before it is

790 - * replaced on disk. Of course no index pointers nor windows for given pack

790 + * replaced on disk. Of course no index pointers or windows for given pack

791 * must subsist at this point. If ever objects from this pack are requested

792 * again, the new version of the pack will be reinitialized through

793 * reprepare_packed_git().

test-chmtime.c

+1 -1

@@ -1,6 +1,6 @@

1 /*

2 * This program can either change modification time of the given

3 - * file(s) or just print it. The program does not change atime nor

3 + * file(s) or just print it. The program does not change atime or

4 * ctime (their values are explicitly preserved).

5 *

6 * The mtime can be changed to an absolute value:

comments: fix misuses of "nor"