Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git.el: Don't use --info-only when resolving a file.
author
Alexandre Julliard
<julliard@winehq.org>
Sat, 6 Jan 2007 10:20:57 +0000
(11:20 +0100)
committer
Junio C Hamano
<junkio@cox.net>
Sat, 6 Jan 2007 18:44:51 +0000
(10:44 -0800)
It doesn't make a difference for git.el, but it helps when interacting
with git-rebase and friends.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
contrib/emacs/git.el
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
e6d7b2f
)
diff --git
a/contrib/emacs/git.el
b/contrib/emacs/git.el
index 972c402ea0e79405ef7123dcdf748eccf9e6f3f7..38915e59aacde35f7042d7c949fe5446ed06a0f8 100644
(file)
--- a/
contrib/emacs/git.el
+++ b/
contrib/emacs/git.el
@@
-777,7
+777,7
@@
and returns the process output as a string."
(interactive)
(let ((files (git-marked-files-state 'unmerged)))
(when files
- (apply #'git-run-command nil nil "update-index" "--
info-only" "--
" (git-get-filenames files))
+ (apply #'git-run-command nil nil "update-index" "--" (git-get-filenames files))
(git-set-files-state files 'modified)
(git-refresh-files))))