1. mirror
  2. git


Junio C Hamano  committed e1ebf21 Merge

Merge branch 'maint'

* maint:
user-manual: Rewrite git-gc section for automatic packing
user-manual: Fix 'you - Git' -> 'you--Git' typo
user-manual: Fix 'http' -> 'HTTP' typos
user-manual: Fix 'both: so' -> 'both; so' typo

  • Participants
  • Parent commits 271cd23, 901fd18
  • Branches master

Comments (0)

Files changed (1)

File Documentation/user-manual.txt

View file
 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
 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.
+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.
 examples section.)
-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
 (See also
 for a slightly more sophisticated setup using WebDAV which also
-allows pushing over http.)
+allows pushing over HTTP.)
 Pushing changes to a public repository
 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.