summaryrefslogtreecommitdiff
path: root/contrib/emacs
diff options
context:
space:
mode:
authorAlexandre Julliard <julliard@winehq.org>2006-10-05 09:29:57 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-10-05 09:31:01 (GMT)
commitc530c5aa31f44adafd1f4ecb05223024162e689c (patch)
treeddf31b0f11504bb8eb0c58982778c01d428d630c /contrib/emacs
parent9ccb64c8e0791a865ad520bcfff4b02cc7c50097 (diff)
downloadgit-c530c5aa31f44adafd1f4ecb05223024162e689c.zip
git-c530c5aa31f44adafd1f4ecb05223024162e689c.tar.gz
git-c530c5aa31f44adafd1f4ecb05223024162e689c.tar.bz2
git.el: Fixed inverted "renamed from/to" message.
The deleted file should be labeled "renamed to" and the added file "renamed from", not the other way around (duh!) Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'contrib/emacs')
-rw-r--r--contrib/emacs/git.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el
index 68de9be..5354cd6 100644
--- a/contrib/emacs/git.el
+++ b/contrib/emacs/git.el
@@ -422,8 +422,8 @@ and returns the process output as a string."
(propertize
(concat " ("
(if (eq state 'copy) "copied from "
- (if (eq (git-fileinfo->state info) 'added) "renamed to "
- "renamed from "))
+ (if (eq (git-fileinfo->state info) 'added) "renamed from "
+ "renamed to "))
(git-escape-file-name (git-fileinfo->orig-name info))
")") 'face 'git-status-face)
"")))