diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2007-12-20 15:05:45 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-20 17:11:20 -0800 |
| commit | 8a82b133547a93e8bdc08fd199c237f540eb9249 (patch) | |
| tree | 4426409a4eaef6eff97961d987f5f0e6f41337c5 | |
| parent | feb7f38b01761a695ecf53f94237251c1d3aa650 (diff) | |
| download | git-8a82b133547a93e8bdc08fd199c237f540eb9249.tar.gz git-8a82b133547a93e8bdc08fd199c237f540eb9249.tar.xz | |
everyday: replace 'prune' and 'repack' with 'gc'
In everyday tasks, "repack -a -d -f" won't be used, so there
is not much point mentioning "repack". By showing the --prune
option to "gc", we can do without mentioning "git prune", too.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/everyday.txt | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/Documentation/everyday.txt b/Documentation/everyday.txt index ce7c170d6..f1993e293 100644 --- a/Documentation/everyday.txt +++ b/Documentation/everyday.txt @@ -30,10 +30,6 @@ Everybody uses these commands to maintain git repositories. * gitlink:git-fsck[1] to check the repository for errors. - * gitlink:git-prune[1] to remove unused objects in the repository. - - * gitlink:git-repack[1] to pack loose objects for efficiency. - * gitlink:git-gc[1] to do common housekeeping tasks such as repack and prune. @@ -45,24 +41,21 @@ Check health and remove cruft.:: ------------ $ git fsck <1> $ git count-objects <2> -$ git repack <3> -$ git gc <4> +$ git gc <3> ------------ + <1> running without `\--full` is usually cheap and assures the repository health reasonably well. <2> check how many loose objects there are and how much disk space is wasted by not repacking. -<3> without `-a` repacks incrementally. repacking every 4-5MB -of loose objects accumulation may be a good rule of thumb. -<4> it is easier to use `git gc` than individual housekeeping commands -such as `prune` and `repack`. This runs `repack -a -d`. +<3> repacks the local repository and performs other housekeeping tasks. Running +without `--prune` is a safe operation even while other ones are in progress. Repack a small project into single pack.:: + ------------ -$ git repack -a -d <1> -$ git prune +$ git gc <1> +$ git gc --prune ------------ + <1> pack all the objects reachable from the refs into one pack, @@ -189,7 +182,7 @@ $ git pull <3> $ git log -p ORIG_HEAD.. arch/i386 include/asm-i386 <4> $ git pull git://git.kernel.org/pub/.../jgarzik/libata-dev.git ALL <5> $ git reset --hard ORIG_HEAD <6> -$ git prune <7> +$ git gc --prune <7> $ git fetch --tags <8> ------------ + |