From ddd2369c5c8b98060cf8fccb27684c2be1cd8935 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Sun, 10 Feb 2013 10:10:36 -0500 Subject: user-manual: Fix 'both: so' -> 'both; so' typo The clause "so `git log ...` will return no commits..." is independent, not a description of "both", so a semicolon is more appropriate. Signed-off-by: W. Trevor King Signed-off-by: Junio C Hamano diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 1b377dc..312fc2b 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 -- cgit v0.10.2-6-g49f6 From de3f2c7b46ee814ea6a7e59c6cf6cad80be6dcca Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Sun, 10 Feb 2013 10:10:37 -0500 Subject: user-manual: Fix 'http' -> 'HTTP' typos HTTP is an acronym which has not (yet) made the transition to word status (unlike "laser", probably because lasers are inherently cooler than HTTP ;). Signed-off-by: W. Trevor King Signed-off-by: Junio C Hamano diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 312fc2b..271d36f 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -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 -- cgit v0.10.2-6-g49f6 From da2c7b3dc512675fae02abdf9449d48850aefb88 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Sun, 10 Feb 2013 10:10:39 -0500 Subject: user-manual: Fix 'you - Git' -> 'you--Git' typo Use an em-dash, not a hyphen, to join these clauses. Signed-off-by: W. Trevor King Signed-off-by: Junio C Hamano diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 271d36f..32dfe8a 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -3396,7 +3396,7 @@ $ git log --raw --all ------------------------------------------------ and just looked for the sha of the missing object (4b9458b..) in that -whole thing. It's up to you - git does *have* a lot of information, it is +whole thing. It's up to you--Git does *have* a lot of information, it is just missing one particular blob version. [[the-index]] -- cgit v0.10.2-6-g49f6 From 901fd180c9d19025bafefc34e131125628169bdd Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Sun, 10 Feb 2013 10:10:27 -0500 Subject: user-manual: Rewrite git-gc section for automatic packing This should have happened back in 2007, when `git gc` learned about auto (e9831e8, git-gc --auto: add documentation, 2007-09-17). Signed-off-by: W. Trevor King Signed-off-by: Junio C Hamano diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 32dfe8a..4cb8325 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -1561,18 +1561,12 @@ $ git stash pop Ensuring good performance ------------------------- -On large repositories, git depends on compression to keep the history -information from taking up too much space on disk or in memory. - -This compression is not performed automatically. Therefore you -should occasionally run linkgit:git-gc[1]: - -------------------------------------------------- -$ git gc -------------------------------------------------- - -to recompress the archive. This can be very time-consuming, so -you may prefer to run `git gc` when you are not doing other work. +On large repositories, Git depends on compression to keep the history +information from taking up too much space on disk or in memory. Some +git commands may automatically run linkgit:git-gc[1], so you don't +have to worry about running it manually. However, compressing a large +repository may take a while, so you may want to call `gc` explicitly +to avoid automatic compression kicking in when it is not convenient. [[ensuring-reliability]] -- cgit v0.10.2-6-g49f6