summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@uchicago.edu>2008-06-30 17:17:07 -0500
committerJunio C Hamano <gitster@pobox.com>2008-07-01 17:20:09 -0700
commit46e56e81b3bc91af7071809fbda8dcdec22c4cb1 (patch)
tree6ac4f9e3daf65f770dd9c767b441367d2b9b0d37
parent963a653fa635c6b07ed399b2fafca2a4d7866a21 (diff)
downloadgit-46e56e81b3bc91af7071809fbda8dcdec22c4cb1.tar.gz
Documentation: prepare to be consistent about "git-" versus "git "
With the dashed forms of git commands not in $(bindir), we have to change many instances of "git-command" to "git command". Also, for consistency it is at times appropriate to make the opposite change. In some cases, the change is not so simple as changing one character. This patch gets rid of some of those cases by rewrapping lines. Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-mailinfo.txt4
-rw-r--r--Documentation/git-tag.txt4
-rw-r--r--Documentation/gitrepository-layout.txt8
-rw-r--r--Documentation/gittutorial.txt4
4 files changed, 10 insertions, 10 deletions
diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt
index 183dc1dd75..6a73b7371a 100644
--- a/Documentation/git-mailinfo.txt
+++ b/Documentation/git-mailinfo.txt
@@ -29,8 +29,8 @@ OPTIONS
among which (1) remove 'Re:' or 're:', (2) leading
whitespaces, (3) '[' up to ']', typically '[PATCH]', and
then prepends "[PATCH] ". This flag forbids this
- munging, and is most useful when used to read back 'git
- format-patch -k' output.
+ munging, and is most useful when used to read back
+ 'git format-patch -k' output.
-u::
The commit log message, author name and author email are
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index 8f40f4bf0d..0c41711115 100644
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -122,8 +122,8 @@ others have already seen the old one. So just use "git tag -f"
again, as if you hadn't already published the old one.
However, Git does *not* (and it should not) change tags behind
-users back. So if somebody already got the old tag, doing a "git
-pull" on your tree shouldn't just make them overwrite the old
+users back. So if somebody already got the old tag, doing a
+"git pull" on your tree shouldn't just make them overwrite the old
one.
If somebody got a release tag from you, you cannot just change
diff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt
index b75508aa50..2afc5a3e88 100644
--- a/Documentation/gitrepository-layout.txt
+++ b/Documentation/gitrepository-layout.txt
@@ -167,14 +167,14 @@ info/grafts::
info/exclude::
This file, by convention among Porcelains, stores the
exclude pattern list. `.gitignore` is the per-directory
- ignore file. `git status`, `git add`, `git rm` and `git
- clean` look at it but the core git commands do not look
+ ignore file. `git status`, `git add`, `git rm` and
+ `git clean` look at it but the core git commands do not look
at it. See also: linkgit:gitignore[5].
remotes::
Stores shorthands to be used to give URL and default
- refnames to interact with remote repository to `git
- fetch`, `git pull` and `git push` commands.
+ refnames to interact with remote repository to
+ `git fetch`, `git pull` and `git push` commands.
logs::
Records of changes made to refs are stored in this
diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt
index b833167242..144bacd3de 100644
--- a/Documentation/gittutorial.txt
+++ b/Documentation/gittutorial.txt
@@ -19,8 +19,8 @@ If you are instead primarily interested in using git to fetch a project,
for example, to test the latest version, you may prefer to start with
the first two chapters of link:user-manual.html[The Git User's Manual].
-First, note that you can get documentation for a command such as "git
-log --graph" with:
+First, note that you can get documentation for a command such as
+"git log --graph" with:
------------------------------------------------
$ man git-log