From b1889c36d85514e5e70462294c561a02c2edfe2b Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Mon, 30 Jun 2008 01:09:04 -0500 Subject: Documentation: be consistent about "git-" versus "git " Since the git-* commands are not installed in $(bindir), using "git-command " in examples in the documentation is not a good idea. On the other hand, it is nice to be able to refer to each command using one hyphenated word. (There is no escaping it, anyway: man page names cannot have spaces in them.) This patch retains the dash in naming an operation, command, program, process, or action. Complete command lines that can be entered at a shell (i.e., without options omitted) are made to use the dashless form. The changes consist only of replacing some spaces with hyphens and vice versa. After a "s/ /-/g", the unpatched and patched versions are identical. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- Documentation/git-add.txt | 2 +- Documentation/git-am.txt | 4 +- Documentation/git-annotate.txt | 2 +- Documentation/git-apply.txt | 2 +- Documentation/git-archimport.txt | 2 +- Documentation/git-archive.txt | 2 +- Documentation/git-bisect.txt | 2 +- Documentation/git-blame.txt | 2 +- Documentation/git-branch.txt | 8 +-- Documentation/git-bundle.txt | 14 ++--- Documentation/git-cat-file.txt | 4 +- Documentation/git-check-attr.txt | 2 +- Documentation/git-check-ref-format.txt | 4 +- Documentation/git-checkout-index.txt | 20 +++--- Documentation/git-checkout.txt | 8 +-- Documentation/git-cherry-pick.txt | 2 +- Documentation/git-cherry.txt | 2 +- Documentation/git-clean.txt | 2 +- Documentation/git-clone.txt | 2 +- Documentation/git-commit-tree.txt | 2 +- Documentation/git-commit.txt | 4 +- Documentation/git-config.txt | 26 ++++---- Documentation/git-count-objects.txt | 4 +- Documentation/git-cvsexportcommit.txt | 8 +-- Documentation/git-cvsimport.txt | 4 +- Documentation/git-cvsserver.txt | 2 +- Documentation/git-daemon.txt | 2 +- Documentation/git-describe.txt | 10 +-- Documentation/git-diff-files.txt | 2 +- Documentation/git-diff-index.txt | 12 ++-- Documentation/git-diff-tree.txt | 8 +-- Documentation/git-diff.txt | 18 +++--- Documentation/git-fast-export.txt | 2 +- Documentation/git-fast-import.txt | 8 +-- Documentation/git-fetch-pack.txt | 2 +- Documentation/git-fetch.txt | 4 +- Documentation/git-filter-branch.txt | 4 +- Documentation/git-fmt-merge-msg.txt | 4 +- Documentation/git-for-each-ref.txt | 8 +-- Documentation/git-format-patch.txt | 2 +- Documentation/git-fsck-objects.txt | 2 +- Documentation/git-fsck.txt | 4 +- Documentation/git-gc.txt | 6 +- Documentation/git-get-tar-commit-id.txt | 2 +- Documentation/git-grep.txt | 2 +- Documentation/git-hash-object.txt | 2 +- Documentation/git-http-fetch.txt | 2 +- Documentation/git-http-push.txt | 2 +- Documentation/git-imap-send.txt | 4 +- Documentation/git-index-pack.txt | 4 +- Documentation/git-init-db.txt | 2 +- Documentation/git-init.txt | 6 +- Documentation/git-instaweb.txt | 4 +- Documentation/git-log.txt | 2 +- Documentation/git-lost-found.txt | 2 +- Documentation/git-ls-files.txt | 2 +- Documentation/git-ls-remote.txt | 2 +- Documentation/git-ls-tree.txt | 2 +- Documentation/git-mailinfo.txt | 4 +- Documentation/git-mailsplit.txt | 2 +- Documentation/git-merge-base.txt | 4 +- Documentation/git-merge-file.txt | 4 +- Documentation/git-merge-index.txt | 6 +- Documentation/git-merge-tree.txt | 2 +- Documentation/git-merge.txt | 10 +-- Documentation/git-mergetool.txt | 16 ++--- Documentation/git-mktag.txt | 2 +- Documentation/git-mktree.txt | 2 +- Documentation/git-mv.txt | 6 +- Documentation/git-name-rev.txt | 2 +- Documentation/git-pack-objects.txt | 2 +- Documentation/git-pack-redundant.txt | 6 +- Documentation/git-pack-refs.txt | 4 +- Documentation/git-patch-id.txt | 2 +- Documentation/git-peek-remote.txt | 2 +- Documentation/git-prune-packed.txt | 2 +- Documentation/git-prune.txt | 4 +- Documentation/git-pull.txt | 2 +- Documentation/git-push.txt | 2 +- Documentation/git-quiltimport.txt | 2 +- Documentation/git-read-tree.txt | 32 +++++----- Documentation/git-rebase.txt | 20 +++--- Documentation/git-receive-pack.txt | 10 +-- Documentation/git-relink.txt | 2 +- Documentation/git-remote.txt | 12 ++-- Documentation/git-repack.txt | 10 +-- Documentation/git-repo-config.txt | 2 +- Documentation/git-request-pull.txt | 2 +- Documentation/git-rerere.txt | 4 +- Documentation/git-rev-list.txt | 10 +-- Documentation/git-rev-parse.txt | 6 +- Documentation/git-revert.txt | 2 +- Documentation/git-rm.txt | 8 +-- Documentation/git-send-email.txt | 2 +- Documentation/git-send-pack.txt | 2 +- Documentation/git-shortlog.txt | 6 +- Documentation/git-show-branch.txt | 4 +- Documentation/git-show-index.txt | 2 +- Documentation/git-show-ref.txt | 6 +- Documentation/git-show.txt | 2 +- Documentation/git-stash.txt | 12 ++-- Documentation/git-status.txt | 6 +- Documentation/git-stripspace.txt | 2 +- Documentation/git-submodule.txt | 10 +-- Documentation/git-svn.txt | 34 +++++------ Documentation/git-symbolic-ref.txt | 2 +- Documentation/git-tag.txt | 14 ++--- Documentation/git-tar-tree.txt | 2 +- Documentation/git-unpack-file.txt | 2 +- Documentation/git-unpack-objects.txt | 2 +- Documentation/git-update-index.txt | 12 ++-- Documentation/git-update-ref.txt | 10 +-- Documentation/git-update-server-info.txt | 2 +- Documentation/git-upload-archive.txt | 2 +- Documentation/git-upload-pack.txt | 2 +- Documentation/git-var.txt | 4 +- Documentation/git-verify-pack.txt | 2 +- Documentation/git-verify-tag.txt | 2 +- Documentation/git-web--browse.txt | 6 +- Documentation/git-whatchanged.txt | 6 +- Documentation/git-write-tree.txt | 2 +- Documentation/gitattributes.txt | 14 ++--- Documentation/gitcore-tutorial.txt | 102 +++++++++++++++---------------- Documentation/gitcvs-migration.txt | 8 +-- Documentation/gitdiffcore.txt | 2 +- Documentation/githooks.txt | 10 +-- Documentation/gitignore.txt | 4 +- Documentation/gitrepository-layout.txt | 18 +++--- Documentation/gittutorial-2.txt | 18 +++--- Documentation/gittutorial.txt | 30 ++++----- Documentation/user-manual.txt | 76 +++++++++++------------ 131 files changed, 462 insertions(+), 462 deletions(-) diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index 2b0ccb3c9..011a74365 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -8,7 +8,7 @@ git-add - Add file contents to the index SYNOPSIS -------- [verse] -'git-add' [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p] +'git add' [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p] [--update | -u] [--refresh] [--ignore-errors] [--] ... diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 46544a076..1296b9117 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -9,11 +9,11 @@ git-am - Apply a series of patches from a mailbox SYNOPSIS -------- [verse] -'git-am' [--signoff] [--keep] [--utf8 | --no-utf8] +'git am' [--signoff] [--keep] [--utf8 | --no-utf8] [--3way] [--interactive] [--binary] [--whitespace=