diff options
| author |  Alexandre Julliard <julliard@winehq.org> | 2006-07-22 15:39:02 +0200 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-07-23 23:35:29 -0700 |
| commit | 51a6e56fb7f63e110dc0c3c1fddd07ca9e22ced6 (patch) | |
| tree | 88659b27d3635ee935322769bd1e29e1a9470597 | |
| parent | git-svn: fix fetching new directories copies when using SVN:: libs (diff) | |
| download | tgif-51a6e56fb7f63e110dc0c3c1fddd07ca9e22ced6.tar.xz | |
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>
| -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 34c995046d..7371d4b463 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)) |