Re: [PATCH 3/4] Fix misuses of nor in comments. (v3)
On Sat, Mar 29, 2014 at 6:59 PM, Justin Lebar jle...@google.com wrote: This version applies successfully to master, maint, next, and pu. The other patches in the previous version of this queue apply successfully without any changes. Signed-off-by: Justin Lebar jle...@google.com --- Makefile| 2 +- builtin/apply.c | 2 +- builtin/checkout.c | 2 +- builtin/log.c | 2 +- builtin/pack-objects.c | 2 +- column.c| 4 ++-- contrib/examples/git-checkout.sh| 2 +- contrib/examples/git-reset.sh | 4 ++-- contrib/fast-import/import-directories.perl | 4 ++-- delta.h | 2 +- diff.c | 2 +- git-am.sh | 2 +- gitweb/gitweb.perl | 2 +- http.h | 4 ++-- perl/Git/SVN.pm | 2 +- perl/Git/SVN/Migration.pm | 2 +- pkt-line.h | 8 remote.c| 2 +- sha1_file.c | 2 +- test-chmtime.c | 2 +- 20 files changed, 27 insertions(+), 27 deletions(-) snip diff --git a/http.h b/http.h index cd37d58..0a7d286 100644 --- a/http.h +++ b/http.h @@ -13,8 +13,8 @@ /* * We detect based on the cURL version if multi-transfer is * usable in this implementation and define this symbol accordingly. - * This is not something Makefile should set nor users should pass - * via CFLAGS. + * This shouldn't be be set by the Makefile or by the user (e.g. via + * CFLAGS). */ #undef USE_CURL_MULTI There's a rather minor typo here: be be Jason -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/4] Fix misuses of nor in comments. (v3)
Thanks; fixed in v4 (just sent out). On Mon, Mar 31, 2014 at 12:54 PM, Jason St. John jstj...@purdue.edu wrote: On Sat, Mar 29, 2014 at 6:59 PM, Justin Lebar jle...@google.com wrote: This version applies successfully to master, maint, next, and pu. The other patches in the previous version of this queue apply successfully without any changes. Signed-off-by: Justin Lebar jle...@google.com --- Makefile| 2 +- builtin/apply.c | 2 +- builtin/checkout.c | 2 +- builtin/log.c | 2 +- builtin/pack-objects.c | 2 +- column.c| 4 ++-- contrib/examples/git-checkout.sh| 2 +- contrib/examples/git-reset.sh | 4 ++-- contrib/fast-import/import-directories.perl | 4 ++-- delta.h | 2 +- diff.c | 2 +- git-am.sh | 2 +- gitweb/gitweb.perl | 2 +- http.h | 4 ++-- perl/Git/SVN.pm | 2 +- perl/Git/SVN/Migration.pm | 2 +- pkt-line.h | 8 remote.c| 2 +- sha1_file.c | 2 +- test-chmtime.c | 2 +- 20 files changed, 27 insertions(+), 27 deletions(-) snip diff --git a/http.h b/http.h index cd37d58..0a7d286 100644 --- a/http.h +++ b/http.h @@ -13,8 +13,8 @@ /* * We detect based on the cURL version if multi-transfer is * usable in this implementation and define this symbol accordingly. - * This is not something Makefile should set nor users should pass - * via CFLAGS. + * This shouldn't be be set by the Makefile or by the user (e.g. via + * CFLAGS). */ #undef USE_CURL_MULTI There's a rather minor typo here: be be Jason -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/4] Fix misuses of nor in comments. (v3)
Justin Lebar jle...@google.com writes:
Thanks; fixed in v4 (just sent out).
I only saw [3/4] that was marked with (v3) at the end, without
[{1,2,4}/4]. As you seem to be renumbering from the very original
(which had l10n at number 3), only sending out what you changed,
expecting that everybody else knows what you are doing, is not very
friendly to anybody who is trying not to lose patches in all the
other activities on the list. Also people who haven't seen the
older iterations do not have to fish them from the archive if you
repost the whole thing.
Please use format-patch -v5 (or whatever numbering) so that the
series iteration number is inside, e.g. [PATCH v5 1/6].
Thanks.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 3/4] Fix misuses of nor in comments. (v3)
This version applies successfully to master, maint, next, and pu. The other
patches in the previous version of this queue apply successfully without any
changes.
Signed-off-by: Justin Lebar jle...@google.com
---
Makefile| 2 +-
builtin/apply.c | 2 +-
builtin/checkout.c | 2 +-
builtin/log.c | 2 +-
builtin/pack-objects.c | 2 +-
column.c| 4 ++--
contrib/examples/git-checkout.sh| 2 +-
contrib/examples/git-reset.sh | 4 ++--
contrib/fast-import/import-directories.perl | 4 ++--
delta.h | 2 +-
diff.c | 2 +-
git-am.sh | 2 +-
gitweb/gitweb.perl | 2 +-
http.h | 4 ++--
perl/Git/SVN.pm | 2 +-
perl/Git/SVN/Migration.pm | 2 +-
pkt-line.h | 8
remote.c| 2 +-
sha1_file.c | 2 +-
test-chmtime.c | 2 +-
20 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/Makefile b/Makefile
index dddaf4f..fc02788 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ all::
#
# Define NEEDS_LIBINTL_BEFORE_LIBICONV if you need libintl before libiconv.
#
-# Define NO_INTPTR_T if you don't have intptr_t nor uintptr_t.
+# Define NO_INTPTR_T if you don't have intptr_t or uintptr_t.
#
# Define NO_UINTMAX_T if you don't have uintmax_t.
#
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.
*/
diff --git a/column.c b/column.c
index 9367ba5..8d1ce88 100644
--- a/column.c
+++ b/column.c
@@ -311,8 +311,8 @@ static int parse_config(unsigned int *colopts, const char
*value)
value += strspn(value, sep);
}
/*
-* Setting layout implies always if neither always, never
-* nor auto is specified.
+* If none of always, never, and auto is specified, then setting
+* layout implies always.
*
* Current value in COL_ENABLE_MASK is disregarded. This means if
* you set column.ui = auto and pass --column=row, then auto
diff --git a/contrib/examples/git-checkout.sh b/contrib/examples/git-checkout.sh
index 1a7689a..d2c1f98 100755
--- a/contrib/examples/git-checkout.sh
