From 51a6e56fb7f63e110dc0c3c1fddd07ca9e22ced6 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Sat, 22 Jul 2006 15:39:02 +0200 Subject: git.el: Run git-rerere on commits if the rr-cache directory exists. Signed-off-by: Alexandre Julliard Signed-off-by: Junio C Hamano --- contrib/emacs/git.el | 2 ++ 1 file changed, 2 insertions(+) (limited to 'contrib') diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el index 34c995046..7371d4b46 100644 --- a/contrib/emacs/git.el +++ b/contrib/emacs/git.el @@ -584,6 +584,8 @@ and returns the process output as a string." (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)) -- cgit v1.2.1