From: Alexandre Julliard Date: Sat, 6 Jan 2007 10:20:57 +0000 (+0100) Subject: git.el: Don't use --info-only when resolving a file. X-Git-Tag: v1.5.0-rc1~81 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cdc0873a78771926b18d9331e04f466ded1b98f2;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el index 972c402ea..38915e59a 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))))