summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-04-10 12:44:45 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-04-10 12:44:45 -0700
commit6eab5f2f14806cf6a7b665d96766a59c13a41f4b (patch)
treed253b7e89110bf4bdb4efd1c6dc19eaecb5986ae /Documentation
parentGit 1.7.9.6 (diff)
parentMerge branch 'jc/maint-verify-objects-remove-pessimism' into maint-1.7.8 (diff)
downloadtgif-6eab5f2f14806cf6a7b665d96766a59c13a41f4b.tar.xz
Merge branch 'maint-1.7.8' into maint-1.7.9
* maint-1.7.8: Documentation/gitweb: trivial English fixes fetch/receive: remove over-pessimistic connectivity check
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/gitweb.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/gitweb.txt b/Documentation/gitweb.txt
index 605a085326..168e8bfed6 100644
--- a/Documentation/gitweb.txt
+++ b/Documentation/gitweb.txt
@@ -14,7 +14,7 @@ gitweb.
DESCRIPTION
-----------
-Gitweb provides a web interface to git repositories. It's features include:
+Gitweb provides a web interface to git repositories. Its features include:
* Viewing multiple Git repositories with common root.
* Browsing every revision of the repository.
@@ -60,7 +60,7 @@ to gitweb. The list of projects is generated by default by scanning the
more exact; gitweb is not interested in a working area, and is best suited
to showing "bare" repositories).
-The name of repository in gitweb is path to it's `$GIT_DIR` (it's object
+The name of the repository in gitweb is the path to its `$GIT_DIR` (its object
database) relative to `$projectroot`. Therefore the repository $repo can be
found at "$projectroot/$repo".