summaryrefslogtreecommitdiff
path: root/Documentation/git-repo-config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-08-08 00:02:07 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-08-08 00:02:07 (GMT)
commit9673198ee867cea4ed70d2cf54c1a2eb8f27bb46 (patch)
treef06a5be02102b0a78f56e18beffa8fa5c3e70b6e /Documentation/git-repo-config.txt
parent96bc4de85cf810db5c7cd94bf0688a98a64a0bc7 (diff)
parent7c49cb288173ab5264b3b9e4257aeeb13388334c (diff)
downloadgit-9673198ee867cea4ed70d2cf54c1a2eb8f27bb46.zip
git-9673198ee867cea4ed70d2cf54c1a2eb8f27bb46.tar.gz
git-9673198ee867cea4ed70d2cf54c1a2eb8f27bb46.tar.bz2
Merge branch 'master' into pb/gitpm
This is to resolve the conflicts with Ryan's annotate updates early.
Diffstat (limited to 'Documentation/git-repo-config.txt')
-rw-r--r--Documentation/git-repo-config.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-repo-config.txt b/Documentation/git-repo-config.txt
index cc72fa9..8a1ab61 100644
--- a/Documentation/git-repo-config.txt
+++ b/Documentation/git-repo-config.txt
@@ -120,8 +120,8 @@ you can set the filemode to true with
% git repo-config core.filemode true
------------
-The hypothetic proxy command entries actually have a postfix to discern
-to what URL they apply. Here is how to change the entry for kernel.org
+The hypothetical proxy command entries actually have a postfix to discern
+what URL they apply to. Here is how to change the entry for kernel.org
to "ssh".
------------