Merge branch 'maint'

diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el
index e5ee8ce58b1d8c729d79caa60885a7c4c4cf2355..e147da0596a880e864fb707192b5bc856cb3daba 100644 (file)
--- a/contrib/emacs/git.el
+++ b/contrib/emacs/git.el
@@ -796,6 +796,7 @@ Return the list of files that haven't been handled."
                             (with-current-buffer buffer (erase-buffer))
                             (dolist (info files) (git-set-fileinfo-state info 'uptodate))
                             (git-call-process-env nil nil "rerere")
+                            (git-call-process-env nil nil "gc" "--auto")
                             (git-refresh-files)
                             (git-refresh-ewoc-hf git-status)
                             (message "Committed %s." commit)