git.el: Run git-rerere on commits if the rr-cache directory exists.
Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Alexandre Julliard committed
Jul 22, 2006 at 15:39 UTC
51a6e56fb7f63e110dc0c3c1fddd07ca9e22ced6
1 file changed
+2
contrib/emacs/git.el
+2
@@ -584,6 +584,8 @@ and returns the process output as a string."
584
(condition-case nil (delete-file ".git/MERGE_HEAD") (error nil))
585
(with-current-buffer buffer (erase-buffer))
586
(git-set-files-state files 'uptodate)
587
+ (when (file-directory-p ".git/rr-cache")
588
+ (git-run-command nil nil "rerere"))
589
(git-refresh-files)
590
(git-refresh-ewoc-hf git-status)
591
(message "Committed %s." commit))