Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Documentation: fix typos in man pages
author
Øystein Walle
<oystwa@gmail.com>
Wed, 5 Feb 2014 22:19:43 +0000
(23:19 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 5 Feb 2014 22:35:45 +0000
(14:35 -0800)
Signed-off-by: Øystein Walle <oystwa@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-clone.txt
patch
|
blob
|
history
Documentation/git-diff.txt
patch
|
blob
|
history
Documentation/gitcli.txt
patch
|
blob
|
history
Documentation/githooks.txt
patch
|
blob
|
history
Documentation/gitweb.conf.txt
patch
|
blob
|
history
Documentation/user-manual.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
3330a2c
)
diff --git
a/Documentation/git-clone.txt
b/Documentation/git-clone.txt
index 450f158779fbfda31c0b3f85d4768a294ef782ef..3865658878e73c9cb598a463aa918a36db6910c8 100644
(file)
--- a/
Documentation/git-clone.txt
+++ b/
Documentation/git-clone.txt
@@
-213,7
+213,7
@@
objects from the source repository into a pack in the cloned repository.
--separate-git-dir=<git dir>::
Instead of placing the cloned repository where it is supposed
to be, place the cloned repository at the specified directory,
--separate-git-dir=<git dir>::
Instead of placing the cloned repository where it is supposed
to be, place the cloned repository at the specified directory,
- then make a filesytem-agnostic Git symbolic link to there.
+ then make a filesy
s
tem-agnostic Git symbolic link to there.
The result is Git repository can be separated from working
tree.
The result is Git repository can be separated from working
tree.
diff --git
a/Documentation/git-diff.txt
b/Documentation/git-diff.txt
index 33fbd8c56f91dd306a80cbd575fb67df43143731..56fb7e532227fa8a69b9e9ada92a1d8eb330c7d6 100644
(file)
--- a/
Documentation/git-diff.txt
+++ b/
Documentation/git-diff.txt
@@
-44,7
+44,7
@@
two blob objects, or changes between two files on disk.
commit relative to the named <commit>. Typically you
would want comparison with the latest commit, so if you
do not give <commit>, it defaults to HEAD.
commit relative to the named <commit>. Typically you
would want comparison with the latest commit, so if you
do not give <commit>, it defaults to HEAD.
- If HEAD does not exist (e.g. unborn
ed
branches) and
+ If HEAD does not exist (e.g. unborn branches) and
<commit> is not given, it shows all staged changes.
--staged is a synonym of --cached.
<commit> is not given, it shows all staged changes.
--staged is a synonym of --cached.
diff --git
a/Documentation/gitcli.txt
b/Documentation/gitcli.txt
index 41bed2983f936bc936cb7e655ceb3ce04146aeeb..c814a3c5cef3d2d9fed7817479a97730fd1c15f3 100644
(file)
--- a/
Documentation/gitcli.txt
+++ b/
Documentation/gitcli.txt
@@
-28,7
+28,7
@@
arguments. Here are the rules:
they can be disambiguated by placing `--` between them.
E.g. `git diff -- HEAD` is, "I have a file called HEAD in my work
tree. Please show changes between the version I staged in the index
they can be disambiguated by placing `--` between them.
E.g. `git diff -- HEAD` is, "I have a file called HEAD in my work
tree. Please show changes between the version I staged in the index
- and what I have in the work tree for that file"
.
not "show difference
+ and what I have in the work tree for that file"
,
not "show difference
between the HEAD commit and the work tree as a whole". You can say
`git diff HEAD --` to ask for the latter.
between the HEAD commit and the work tree as a whole". You can say
`git diff HEAD --` to ask for the latter.
diff --git
a/Documentation/githooks.txt
b/Documentation/githooks.txt
index d48bf4d6fae12a21232bc74ddeb230885c1bcbb9..d954bf6ba872e31c1197a96487fafd3ad8f73844 100644
(file)
--- a/
Documentation/githooks.txt
+++ b/
Documentation/githooks.txt
@@
-251,7
+251,7
@@
three parameters:
- the name of the ref being updated,
- the old object name stored in the ref,
- the name of the ref being updated,
- the old object name stored in the ref,
- - and the new objectname to be stored in the ref.
+ - and the new object
name to be stored in the ref.
A zero exit from the update hook allows the ref to be updated.
Exiting with a non-zero status prevents 'git-receive-pack'
A zero exit from the update hook allows the ref to be updated.
Exiting with a non-zero status prevents 'git-receive-pack'
diff --git
a/Documentation/gitweb.conf.txt
b/Documentation/gitweb.conf.txt
index e2113d93c9d34aa0af3fd421d5f6ed9bf01ad896..b845a456914f6e3412e361e3fe25e7e944c8e1f3 100644
(file)
--- a/
Documentation/gitweb.conf.txt
+++ b/
Documentation/gitweb.conf.txt
@@
-630,13
+630,13
@@
need to set this element to empty list i.e. `[]`.
override::
If this field has a true value then the given feature is
override::
If this field has a true value then the given feature is
- overrid
d
able, which means that it can be configured
+ overridable, which means that it can be configured
(or enabled/disabled) on a per-repository basis.
+
Usually given "<feature>" is configurable via the `gitweb.<feature>`
config variable in the per-repository Git configuration file.
+
(or enabled/disabled) on a per-repository basis.
+
Usually given "<feature>" is configurable via the `gitweb.<feature>`
config variable in the per-repository Git configuration file.
+
-*Note* that no feature is overrid
d
able by default.
+*Note* that no feature is overridable by default.
sub::
Internal detail of implementation. What is important is that
sub::
Internal detail of implementation. What is important is that
diff --git
a/Documentation/user-manual.txt
b/Documentation/user-manual.txt
index cbb01a1ea2e05c7adb1be3d5fde1261ef9ff71e5..4555807b78893a28a4cf3b88c540ca28cb5dd57b 100644
(file)
--- a/
Documentation/user-manual.txt
+++ b/
Documentation/user-manual.txt
@@
-3795,7
+3795,7
@@
like so:
$ git update-index filename
-------------------------------------------------
$ git update-index filename
-------------------------------------------------
-but to avoid common mistakes with filename globbing etc, the command
+but to avoid common mistakes with filename globbing etc
.
, the command
will not normally add totally new entries or remove old entries,
i.e. it will normally just update existing cache entries.
will not normally add totally new entries or remove old entries,
i.e. it will normally just update existing cache entries.