[PATCH 0/4] Fix misuses of "nor" (v2)
- From
Justin Lebar <jlebar@google.com>
- Date
- Mar 20, 2014, 22:16 UTC
- Message-ID
- <1395353785-23611-1-git-send-email-jlebar@google.com>
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