Browse Source

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>
maint
Alexandre Julliard 18 years ago committed by Junio C Hamano
parent
commit
cdc0873a78
  1. 2
      contrib/emacs/git.el

2
contrib/emacs/git.el

@ -777,7 +777,7 @@ and returns the process output as a string." @@ -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))))


Loading…
Cancel
Save