diff options
author | Alexandre Julliard <julliard@winehq.org> | 2007-01-06 11:20:57 +0100 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-01-06 10:44:51 -0800 |
commit | cdc0873a78771926b18d9331e04f466ded1b98f2 (patch) | |
tree | 6927941723c4b441c8d21886621583bf69e5897d /contrib/emacs | |
parent | e6d7b2f62e52c95c47b078f786705ef9ff8f43c2 (diff) | |
download | git-cdc0873a78771926b18d9331e04f466ded1b98f2.tar.gz |
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')
-rw-r--r-- | contrib/emacs/git.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el index 972c402ea0..38915e59aa 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)))) |