summaryrefslogtreecommitdiff
path: root/contrib/emacs/git.el
diff options
context:
space:
mode:
authorAlexandre Julliard <julliard@winehq.org>2007-01-06 10:20:57 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-01-06 18:44:51 (GMT)
commitcdc0873a78771926b18d9331e04f466ded1b98f2 (patch)
tree6927941723c4b441c8d21886621583bf69e5897d /contrib/emacs/git.el
parente6d7b2f62e52c95c47b078f786705ef9ff8f43c2 (diff)
downloadgit-cdc0873a78771926b18d9331e04f466ded1b98f2.zip
git-cdc0873a78771926b18d9331e04f466ded1b98f2.tar.gz
git-cdc0873a78771926b18d9331e04f466ded1b98f2.tar.bz2
git.el: Don't use --info-only when resolving a file.
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>
Diffstat (limited to 'contrib/emacs/git.el')
-rw-r--r--contrib/emacs/git.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el
index 972c402..38915e5 100644
--- 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))))