mirror of
https://github.com/git/git.git
synced 2025-04-14 13:05:32 +00:00
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>
This commit is contained in:
parent
e6d7b2f62e
commit
cdc0873a78
@ -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…
x
Reference in New Issue
Block a user