summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9ad7c5a)
raw | patch | inline | side by side (parent: 9ad7c5a)
author | Alexandre Julliard <julliard@winehq.org> | |
Sun, 28 Oct 2007 10:05:11 +0000 (11:05 +0100) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sun, 28 Oct 2007 21:08:28 +0000 (14:08 -0700) |
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/emacs/git.el | patch | blob | history |
diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el
index 4286d160a02bdbeff272cc306ab01b85b87b8cbe..8cfbdd7be453f2a6a95028825b4a21184487f2fc 100644 (file)
--- a/contrib/emacs/git.el
+++ b/contrib/emacs/git.el
(when modified
(apply #'git-call-process-env nil nil "checkout" "HEAD" modified))
(git-update-status-files (append added modified) 'uptodate)
- (git-success-message "Reverted" files))))
+ (git-success-message "Reverted" (git-get-filenames files)))))
(defun git-resolve-file ()
"Resolve conflicts in marked file(s)."