summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9ccb64c)
raw | patch | inline | side by side (parent: 9ccb64c)
author | Alexandre Julliard <julliard@winehq.org> | |
Thu, 5 Oct 2006 09:29:57 +0000 (11:29 +0200) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Thu, 5 Oct 2006 09:31:01 +0000 (02:31 -0700) |
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>
"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>
contrib/emacs/git.el | patch | blob | history |
diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el
index 68de9be0c7cca8645275a042900766b6ea2712c7..5354cd67b3dfa05d0018c03f15d0dcaf4e3df4a7 100644 (file)
--- a/contrib/emacs/git.el
+++ b/contrib/emacs/git.el
(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)
"")))