summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-10-03 10:05:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-10-03 10:05:32 (GMT)
commit0341091a9ec47576a2fdfab181145fa94c04b810 (patch)
treec58af279d72fb1850af97136b6868049644bfe81 /git-merge.sh
parente56f6359ffd22176c2a31d4d7484b9a5880f885b (diff)
parent17815501a8f95c080891acd9537514adfe17c80e (diff)
downloadgit-0341091a9ec47576a2fdfab181145fa94c04b810.zip
git-0341091a9ec47576a2fdfab181145fa94c04b810.tar.gz
git-0341091a9ec47576a2fdfab181145fa94c04b810.tar.bz2
Merge branch 'jc/autogc'
* jc/autogc: git-gc --auto: run "repack -A -d -l" as necessary. git-gc --auto: restructure the way "repack" command line is built. git-gc --auto: protect ourselves from accumulated cruft git-gc --auto: add documentation. git-gc --auto: move threshold check to need_to_gc() function. repack -A -d: use --keep-unreachable when repacking pack-objects --keep-unreachable Export matches_pack_name() and fix its return value Invoke "git gc --auto" from commit, merge, am and rebase. Implement git gc --auto
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-xgit-merge.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-merge.sh b/git-merge.sh
index 6c513dc..bf18f58 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -82,6 +82,7 @@ finish () {
;;
*)
git update-ref -m "$rlogm" HEAD "$1" "$head" || exit 1
+ git gc --auto
;;
esac
;;