diff options
author | Junio C Hamano <gitster@pobox.com> | 2007-10-03 03:05:32 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-10-03 03:05:32 -0700 |
commit | 0341091a9ec47576a2fdfab181145fa94c04b810 (patch) | |
tree | c58af279d72fb1850af97136b6868049644bfe81 /git-merge.sh | |
parent | e56f6359ffd22176c2a31d4d7484b9a5880f885b (diff) | |
parent | 17815501a8f95c080891acd9537514adfe17c80e (diff) | |
download | git-0341091a9ec47576a2fdfab181145fa94c04b810.tar.gz git-0341091a9ec47576a2fdfab181145fa94c04b810.tar.xz |
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-x | git-merge.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-merge.sh b/git-merge.sh index 6c513dcbd..bf18f582d 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 ;; |