From: Alexandre Julliard Date: Sat, 22 Jul 2006 13:39:02 GMT Subject: [PATCH 1/4] git.el: Run git-rerere on commits if the rr-cache directory exists. Message-ID: <877j25hi89.fsf@wine.dyndns.org> Signed-off-by: Alexandre Julliard --- contrib/emacs/git.el | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el index 34c9950..7371d4b 100644 --- a/contrib/emacs/git.el +++ b/contrib/emacs/git.el @@ -584,6 +584,8 @@ (defun git-do-commit () (condition-case nil (delete-file ".git/MERGE_HEAD") (error nil)) (with-current-buffer buffer (erase-buffer)) (git-set-files-state files 'uptodate) + (when (file-directory-p ".git/rr-cache") + (git-run-command nil nil "rerere")) (git-refresh-files) (git-refresh-ewoc-hf git-status) (message "Committed %s." commit)) -- 1.4.2.rc1.ge7a0 -- Alexandre Julliard julliard@winehq.org