Skip to content

Commit

Permalink
Merge branch 'ow/manpages-typofix'
Browse files Browse the repository at this point in the history
Various typofixes, all looked correct.

* ow/manpages-typofix:
  Documentation: fix typos in man pages
  • Loading branch information
Junio C Hamano committed Feb 7, 2014
2 parents c256661 + 5fe8f49 commit efe5f1d
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Documentation/git-clone.txt
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,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,
then make a filesytem-agnostic Git symbolic link to there.
then make a filesystem-agnostic Git symbolic link to there.
The result is Git repository can be separated from working
tree.

Expand Down
2 changes: 1 addition & 1 deletion Documentation/git-diff.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
If HEAD does not exist (e.g. unborned 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.

Expand Down
2 changes: 1 addition & 1 deletion Documentation/gitcli.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
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.

Expand Down
2 changes: 1 addition & 1 deletion Documentation/githooks.txt
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ three parameters:

- 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'
Expand Down
4 changes: 2 additions & 2 deletions Documentation/gitweb.conf.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
overriddable, 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.
+
*Note* that no feature is overriddable by default.
*Note* that no feature is overridable by default.

sub::
Internal detail of implementation. What is important is that
Expand Down
2 changes: 1 addition & 1 deletion Documentation/user-manual.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3795,7 +3795,7 @@ like so:
$ 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.

Expand Down

0 comments on commit efe5f1d

Please sign in to comment.