Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
doc: fix minor typos (extra/duplicated words)
author
Evan Zacks
<zackse@gmail.com>
Tue, 12 Sep 2017 22:58:39 +0000
(15:58 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 14 Sep 2017 06:09:02 +0000
(15:09 +0900)
Following are several fixes for duplicated words ("of of") and one
case where an extra article ("a") slipped in.
Signed-off-by: Evan Zacks <zackse@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-cat-file.txt
patch
|
blob
|
history
Documentation/git-checkout.txt
patch
|
blob
|
history
Documentation/git-notes.txt
patch
|
blob
|
history
Documentation/git-update-index.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
94c9fd2
)
diff --git
a/Documentation/git-cat-file.txt
b/Documentation/git-cat-file.txt
index 204541c690ce24bdf5b6e20baa0ddca928920f71..fb09cd69d63fec03ad1987970fdbdffe8d8a4339 100644
(file)
--- a/
Documentation/git-cat-file.txt
+++ b/
Documentation/git-cat-file.txt
@@
-192,7
+192,7
@@
newline. The available atoms are:
The 40-hex object name of the object.
`objecttype`::
The 40-hex object name of the object.
`objecttype`::
- The type of
of
the object (the same as `cat-file -t` reports).
+ The type of the object (the same as `cat-file -t` reports).
`objectsize`::
The size, in bytes, of the object (the same as `cat-file -s`
`objectsize`::
The size, in bytes, of the object (the same as `cat-file -s`
diff --git
a/Documentation/git-checkout.txt
b/Documentation/git-checkout.txt
index d6399c0af86bb84cd86b82500ce706cbcd93cd93..bd268a8fccc32a1d218b30d58a688353a0fe236f 100644
(file)
--- a/
Documentation/git-checkout.txt
+++ b/
Documentation/git-checkout.txt
@@
-38,7
+38,7
@@
$ git checkout -b <branch> --track <remote>/<branch>
------------
+
You could omit <branch>, in which case the command degenerates to
------------
+
You could omit <branch>, in which case the command degenerates to
-"check out the current branch", which is a glorified no-op with
a
+"check out the current branch", which is a glorified no-op with
rather expensive side-effects to show only the tracking information,
if exists, for the current branch.
rather expensive side-effects to show only the tracking information,
if exists, for the current branch.
diff --git
a/Documentation/git-notes.txt
b/Documentation/git-notes.txt
index be7db3048d4776200c6ed8781b25ffccb68a41eb..43677297f3b85814c18c972a159b81c8076bc445 100644
(file)
--- a/
Documentation/git-notes.txt
+++ b/
Documentation/git-notes.txt
@@
-171,7
+171,7
@@
OPTIONS
object that does not have notes attached to it.
--stdin::
object that does not have notes attached to it.
--stdin::
- Also read the object names to remove notes from
from
the standard
+ Also read the object names to remove notes from the standard
input (there is no reason you cannot combine this with object
names from the command line).
input (there is no reason you cannot combine this with object
names from the command line).
diff --git
a/Documentation/git-update-index.txt
b/Documentation/git-update-index.txt
index 1579abf3c3b45f4e63f8f17746dde31a06a3a564..a14e6aebd9dc8e3b523b4145236fc413e00d4492 100644
(file)
--- a/
Documentation/git-update-index.txt
+++ b/
Documentation/git-update-index.txt
@@
-153,7
+153,7
@@
you will need to handle the situation manually.
+
Version 4 performs a simple pathname compression that reduces index
size by 30%-50% on large repositories, which results in faster load
+
Version 4 performs a simple pathname compression that reduces index
size by 30%-50% on large repositories, which results in faster load
-time. Version 4 is relatively young (first released in
in
1.8.0 in
+time. Version 4 is relatively young (first released in 1.8.0 in
October 2012). Other Git implementations such as JGit and libgit2
may not support it yet.
October 2012). Other Git implementations such as JGit and libgit2
may not support it yet.