X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Documentation%2Fuser-manual.txt;h=271d36f8e5a789d47fdfa7772b29cda979d5d05f;hb=de3f2c7b46ee814ea6a7e59c6cf6cad80be6dcca;hp=1b377dc20736320fb442255c88310d62078b21e0;hpb=1b800f8f505e3d279a6017845049154eced5311e;p=git-core%2Fgit.git diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 1b377dc20..271d36f8e 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -782,7 +782,7 @@ e05db0fd4f31dde7005f075a84f96b360d05984b Or you could recall that the ... operator selects all commits contained reachable from either one reference or the other but not -both: so +both; so ------------------------------------------------- $ git log origin...master @@ -1931,11 +1931,11 @@ linkgit:git-daemon[1] man page for details. (See especially the examples section.) [[exporting-via-http]] -Exporting a git repository via http +Exporting a git repository via HTTP ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The git protocol gives better performance and reliability, but on a -host with a web server set up, http exports may be simpler to set up. +host with a web server set up, HTTP exports may be simpler to set up. All you need to do is place the newly created bare git repository in a directory that is exported by the web server, and make some @@ -1961,7 +1961,7 @@ $ git clone http://yourserver.com/~you/proj.git (See also link:howto/setup-git-server-over-http.txt[setup-git-server-over-http] for a slightly more sophisticated setup using WebDAV which also -allows pushing over http.) +allows pushing over HTTP.) [[pushing-changes-to-a-public-repository]] Pushing changes to a public repository