diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | 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 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)) |