[PATCH 3/6] Fix misuses of nor in comments.

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

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

Re: [PATCH 3/6] Fix misuses of nor in comments.

Sorry, still figuring out the right workflow here: The subject should say v4, and it should say patch 3/4. On Mon, Mar 31, 2014 at 2:04 PM, Justin Lebar jle...@google.com wrote: Signed-off-by: Justin Lebar jle...@google.com --- Makefile| 2 +- builtin

[PATCH v5 3/4] Fix misuses of nor in comments

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

[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

Re: [PATCH 3/4] Fix misuses of nor in comments

...@purdue.edu wrote: On Thu, Mar 20, 2014 at 7:13 PM, Justin Lebar jle...@google.com wrote: Thanks for the quick reply. When I send a new patch, should I fold these changes into the original commit, or should I send them as a separate commit? diff --git a/builtin/apply.c b/builtin/apply.c index b0d0986

[PATCH 1/4] Documentation: Fix misuses of nor

Signed-off-by: Justin Lebar jle...@google.com --- Documentation/CodingGuidelines | 4 ++-- Documentation/config.txt| 6 +++--- Documentation/diff-generate-patch.txt | 2 +- Documentation/diff-options.txt | 2

[PATCH 3/4] Fix misuses of nor in comments

Signed-off-by: Justin Lebar jle...@gmail.com --- Makefile| 2 +- builtin/apply.c | 2 +- builtin/checkout.c | 2 +- builtin/log.c | 2 +- builtin/pack-objects.c

[PATCH 2/4] contrib: Fix misuses of nor

Signed-off-by: Justin Lebar jle...@google.com --- contrib/examples/git-commit.sh | 2 +- contrib/svn-fe/svn-fe.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/examples/git-commit.sh b/contrib/examples/git-commit.sh index 23ffb02..4aab1a6 100755

[PATCH 0/4] Fix misuses of nor (v2)

later). - Fold the inside-tests and outside-tests patches. - CC different people, as Duy indicated he wasn't comfortable reviewing. Justin Lebar (4): Documentation: Fix misuses of nor contrib: Fix misuses of nor Fix misuses of nor in comments Fix misuses of nor outside comments

[PATCH 4/4] Fix misuses of nor outside comments and in tests

Signed-off-by: Justin Lebar jle...@gmail.com --- builtin/clean.c | 6 +++--- builtin/commit.c | 2 +- git-add--interactive.perl | 4 ++-- perl/Git/SVN.pm | 4 ++-- sha1_file.c | 2 +- t/t1001-read-tree-m-2way.sh

Re: [PATCH 3/4] Fix misuses of nor in comments

Thanks for the quick reply. When I send a new patch, should I fold these changes into the original commit, or should I send them as a separate commit? 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

Re: [PATCH 3/6] l10n: Fix misuses of nor

Thanks. I'll remove this patch from the queue. On Sun, Mar 16, 2014 at 6:45 PM, Jiang Xin worldhello@gmail.com wrote: 2014-03-15 16:41 GMT+08:00 Justin Lebar jle...@google.com: Signed-off-by: Justin Lebar jle...@google.com --- po/bg.po| 6 +++--- po/de.po| 6 +++--- po/fr.po

[PATCH 0/6] Fix misuses of nor

packaged this change; apologies in advance. Justin Lebar (6): Documentation: Fix misuses of nor contrib: Fix misuses of nor l10n: Fix misuses of nor Fix misuses of nor in comments Fix misuses of nor outside comments Tests: Fix misuses of nor Documentation/CodingGuidelines

[PATCH 2/6] contrib: Fix misuses of nor

Signed-off-by: Justin Lebar jle...@google.com --- contrib/examples/git-commit.sh | 2 +- contrib/svn-fe/svn-fe.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/examples/git-commit.sh b/contrib/examples/git-commit.sh index 23ffb02..4aab1a6 100755

[PATCH 4/6] Fix misuses of nor in comments

Signed-off-by: Justin Lebar jle...@gmail.com --- Makefile| 2 +- builtin/apply.c | 2 +- builtin/checkout.c | 2 +- builtin/log.c | 2 +- builtin/pack-objects.c

[PATCH 5/6] Fix misuses of nor outside comments

Signed-off-by: Justin Lebar jle...@gmail.com --- builtin/clean.c | 6 +++--- builtin/commit.c | 2 +- git-add--interactive.perl | 4 ++-- perl/Git/SVN.pm | 4 ++-- sha1_file.c | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/builtin

[PATCH 6/6] Tests: Fix misuses of nor

Signed-off-by: Justin Lebar jle...@gmail.com --- t/t1001-read-tree-m-2way.sh | 2 +- t/t4005-diff-rename-2.sh | 2 +- t/t4009-diff-rename-4.sh | 2 +- t/t5304-prune.sh | 2 +- t/t6036-recursive-corner-cases.sh | 2 +- t/t7104-reset.sh | 2

[PATCH 1/6] Documentation: Fix misuses of nor

Signed-off-by: Justin Lebar jle...@google.com --- Documentation/CodingGuidelines | 4 ++-- Documentation/config.txt| 6 +++--- Documentation/diff-generate-patch.txt | 2 +- Documentation/diff-options.txt | 2

[PATCH 3/6] l10n: Fix misuses of nor

Signed-off-by: Justin Lebar jle...@google.com --- po/bg.po| 6 +++--- po/de.po| 6 +++--- po/fr.po| 6 +++--- po/git.pot | 6 +++--- po/it.po| 2 +- po/pt_PT.po | 2 +- po/sv.po| 6 +++--- po/vi.po| 6 +++--- po/zh_CN.po | 6 +++--- 9 files changed, 23 insertions(+), 23

Re: [PATCH 0/6] Fix misuses of nor

myself. This caused me to finally break down and order Garner's Modern American Usage, which I hope will reveal all. :) -Justin On Sat, Mar 15, 2014 at 1:56 AM, Duy Nguyen pclo...@gmail.com wrote: On Sat, Mar 15, 2014 at 3:41 PM, Justin Lebar jle...@google.com wrote: I got annoyed by git's