diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-02-07 23:55:11 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-02-07 23:55:12 +0400 |
commit | efe5f1d25d198ae8796b6f095c2cffae270bb9b6 (patch) | |
tree | 9b851ba1b50793afd5384d77a72b1d254a0ee9c7 /Documentation | |
parent | c256661bbe09c842f7b6fe24986294d611f25200 (diff) | |
parent | 5fe8f49b6d59cf143a5898ddbb161444a95fa871 (diff) |
Merge branch 'ow/manpages-typofix'
Various typofixes, all looked correct.
* ow/manpages-typofix:
Documentation: fix typos in man pages
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/git-clone.txt | 2 | ||||
-rw-r--r-- | Documentation/git-diff.txt | 2 | ||||
-rw-r--r-- | Documentation/gitcli.txt | 2 | ||||
-rw-r--r-- | Documentation/githooks.txt | 2 | ||||
-rw-r--r-- | Documentation/gitweb.conf.txt | 4 | ||||
-rw-r--r-- | Documentation/user-manual.txt | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt index 49878570bf..bf3dac0cef 100644 --- a/Documentation/git-clone.txt +++ b/Documentation/git-clone.txt @@ -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. diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index 33fbd8c56f..56fb7e5322 100644 --- 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. - 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. diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt index 3f33ca5507..1c3e109cb3 100644 --- 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 - 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. diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt index d48bf4d6fa..d954bf6ba8 100644 --- 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, - - 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' diff --git a/Documentation/gitweb.conf.txt b/Documentation/gitweb.conf.txt index db4154f9d5..952f503afb 100644 --- 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 - 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 diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 248dcabd50..d4f9804462 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -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. |