git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / Atom feed
From: Justin Lebar <jlebar@google.com>
To: git@vger.kernel.org
Cc: Justin Lebar <jlebar@google.com>, Jeff King <peff@peff.net>,
	Jonathan Nieder <jrnieder@gmail.com>,
	Richard Hansen <rhansen@bbn.com>,
	"Shawn O. Pearce" <spearce@spearce.org>
Subject: [PATCH 0/4] Fix misuses of "nor" (v2)
Date: Thu, 20 Mar 2014 15:16:21 -0700
Message-ID: <1395353785-23611-1-git-send-email-jlebar@google.com> (raw)

I got annoyed by git's awkward use of "nor" in man pages and in git add -p, so
I went ahead and audited all uses of "nor" in the tree.  One might be able to
argue that some of the uses I've changed are technically acceptable, but that's
a pretty low bar to set for ourselves.  I aimed to make everything both correct
and idiomatic.

All I really care about is git-add--interactive.perl and (to a lesser extent)
the docs, so if any of these other changes are controversial or annoying to
take, I'm happy to drop them.

Changes from v1 are:

- Drop the l10n patch (changes will be automatically picked up 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 and in tests

 Documentation/CodingGuidelines                      |  4 ++--
 Documentation/config.txt                            |  6 +++---
 Documentation/diff-generate-patch.txt               |  2 +-
 Documentation/diff-options.txt                      |  2 +-
 Documentation/everyday.txt                          |  2 +-
 Documentation/git-add.txt                           |  4 ++--
 Documentation/git-count-objects.txt                 |  4 ++--
 Documentation/git-diff.txt                          |  4 ++--
 Documentation/git-prune.txt                         |  2 +-
 Documentation/git-push.txt                          |  2 +-
 Documentation/git-read-tree.txt                     |  2 +-
 Documentation/git-reset.txt                         |  6 +++---
 Documentation/git-show-branch.txt                   |  2 +-
 Documentation/git-show-ref.txt                      |  2 +-
 Documentation/howto/rebase-from-internal-branch.txt |  2 +-
 Documentation/howto/revert-a-faulty-merge.txt       |  4 ++--
 Documentation/howto/revert-branch-rebase.txt        |  2 +-
 Documentation/merge-options.txt                     | 15 +++++++--------
 Documentation/pretty-formats.txt                    |  2 +-
 Documentation/pretty-options.txt                    |  2 +-
 Documentation/rev-list-options.txt                  |  2 +-
 Documentation/technical/api-gitattributes.txt       |  2 +-
 Documentation/technical/pack-protocol.txt           |  8 ++++----
 Documentation/technical/protocol-common.txt         |  2 +-
 Documentation/user-manual.txt                       |  2 +-
 Makefile                                            |  2 +-
 builtin/apply.c                                     |  2 +-
 builtin/checkout.c                                  |  2 +-
 builtin/clean.c                                     |  6 +++---
 builtin/commit.c                                    |  2 +-
 builtin/log.c                                       |  2 +-
 builtin/pack-objects.c                              |  2 +-
 builtin/reset.c                                     |  4 ++--
 builtin/show-branch.c                               |  2 +-
 column.c                                            |  2 +-
 contrib/examples/git-checkout.sh                    |  2 +-
 contrib/examples/git-commit.sh                      |  2 +-
 contrib/examples/git-reset.sh                       |  4 ++--
 contrib/fast-import/import-directories.perl         |  4 ++--
 contrib/svn-fe/svn-fe.txt                           |  4 ++--
 delta.h                                             |  2 +-
 diff.c                                              |  2 +-
 git-add--interactive.perl                           |  4 ++--
 git-am.sh                                           |  2 +-
 gitweb/gitweb.perl                                  |  2 +-
 http.h                                              |  4 ++--
 perl/Git/SVN.pm                                     |  6 +++---
 perl/Git/SVN/Migration.pm                           |  2 +-
 pkt-line.h                                          |  2 +-
 remote.c                                            |  2 +-
 sha1_file.c                                         |  4 ++--
 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 +-
 t/t9400-git-cvsserver-server.sh                     |  2 +-
 test-chmtime.c                                      |  2 +-
 59 files changed, 88 insertions(+), 89 deletions(-)

-- 
1.9.0.279.gdc9e3eb

             reply index

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-20 22:16 Justin Lebar [this message]
2014-03-20 22:16 ` [PATCH 1/4] Documentation: Fix misuses of "nor" Justin Lebar
2014-03-20 22:16 ` [PATCH 2/4] contrib: " Justin Lebar
2014-03-20 22:16 ` [PATCH 3/4] Fix misuses of "nor" in comments Justin Lebar
2014-03-20 22:34   ` Jason St. John
2014-03-20 23:13     ` Justin Lebar
2014-03-21 17:52       ` Junio C Hamano
2014-03-21 17:58       ` Junio C Hamano
2014-03-22 23:47       ` Jason St. John
2014-03-29  1:52         ` Justin Lebar
2014-03-20 22:16 ` [PATCH 4/4] Fix misuses of "nor" outside comments and in tests Justin Lebar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1395353785-23611-1-git-send-email-jlebar@google.com \
    --to=jlebar@google.com \
    --cc=git@vger.kernel.org \
    --cc=jrnieder@gmail.com \
    --cc=peff@peff.net \
    --cc=rhansen@bbn.com \
    --cc=spearce@spearce.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

git@vger.kernel.org list mirror (unofficial, one of many)

Archives are clonable:
	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Example config snippet for mirrors

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.io/gmane.comp.version-control.git

 note: .onion URLs require Tor: https://www.torproject.org/

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git