From: Junio C Hamano <junkio@cox.net>
Date: Thu, 28 Dec 2006 00:43:15 +0000 (-0800)
Subject: Merge branch 'sp/gc'
X-Git-Tag: v1.5.0-rc1~181
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7c20b8234af2962ea4d5ce930ec0308c33f6f654?ds=inline;hp=-c

Merge branch 'sp/gc'

* sp/gc:
Use 'repack -a -d -l' instead of 'repack -a -d' in git-gc
everyday: replace a few 'prune' and 'repack' with 'gc'
Create 'git gc' to perform common maintenance operations.
---

7c20b8234af2962ea4d5ce930ec0308c33f6f654
diff --combined Makefile
index f862170b1f,12f4bd22e7..775ffaac27
--- a/Makefile
+++ b/Makefile
@@@ -157,7 -157,7 +157,7 @@@ BASIC_LDFLAGS 
  SCRIPT_SH = \
  	git-bisect.sh git-checkout.sh \
  	git-clean.sh git-clone.sh git-commit.sh \
- 	git-fetch.sh \
+ 	git-fetch.sh git-gc.sh \
  	git-ls-remote.sh \
  	git-merge-one-file.sh git-parse-remote.sh \
  	git-pull.sh git-rebase.sh \
@@@ -360,8 -360,8 +360,8 @@@ ifeq ($(uname_O),Cygwin
  	NO_FAST_WORKING_DIRECTORY = UnfortunatelyYes
  	# There are conflicting reports about this.
  	# On some boxes NO_MMAP is needed, and not so elsewhere.
 -	# Try uncommenting this if you see things break -- YMMV.
 -	# NO_MMAP = YesPlease
 +	# Try commenting this out if you suspect MMAP is more efficient
 +	NO_MMAP = YesPlease
  	NO_IPV6 = YesPlease
  	X = .exe
  endif