diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-18 14:19:10 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-18 14:19:10 +0900 |
| commit | 0c521503a090838a0501a09135e44e1d089422cc (patch) | |
| tree | 5f64717c5d6b2ec116505d0daa1067abff664af4 | |
| parent | 5a4ec5cb2274934d9cf236137e98062b04e6167e (diff) | |
| parent | be94568bc7edf3ae4baf7542c216df3d6996373c (diff) | |
| download | git-0c521503a090838a0501a09135e44e1d089422cc.tar.gz git-0c521503a090838a0501a09135e44e1d089422cc.tar.xz | |
Merge branch 'ez/doc-duplicated-words-fix' into maint
Typofix.
* ez/doc-duplicated-words-fix:
doc: fix minor typos (extra/duplicated words)
| -rw-r--r-- | Documentation/git-cat-file.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-checkout.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-notes.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-update-index.txt | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt index 204541c69..fb09cd69d 100644 --- 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 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` diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index d6399c0af..bd268a8fc 100644 --- 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 -"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. diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt index be7db3048..43677297f 100644 --- 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:: - 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). diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt index 1579abf3c..a14e6aebd 100644 --- 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 -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. |