diff options
Diffstat (limited to 'lisp/vc/vc-git.el')
| -rw-r--r-- | lisp/vc/vc-git.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index cc3e295641c..71cf57ab32e 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -951,6 +951,10 @@ This prompts for a branch to merge from." "DU" "AA" "UU")) (push (expand-file-name file directory) files))))))) +;; Everywhere but here, follows vc-git-command, which uses vc-do-command +;; from vc-dispatcher. +(autoload 'vc-resynch-buffer "vc-dispatcher") + (defun vc-git-resolve-when-done () "Call \"git add\" if the conflict markers have been removed." (save-excursion @@ -964,6 +968,7 @@ This prompts for a branch to merge from." (vc-git-root buffer-file-name))) (vc-git-conflicted-files (vc-git-root buffer-file-name))) (vc-git-command nil 0 nil "reset")) + (vc-resynch-buffer buffer-file-name t t) ;; Remove the hook so that it is not called multiple times. (remove-hook 'after-save-hook 'vc-git-resolve-when-done t)))) @@ -1450,10 +1455,6 @@ This command shares argument histories with \\[rgrep] and \\[grep]." (if (eq next-error-last-buffer (current-buffer)) (setq default-directory dir)))))) -;; Everywhere but here, follows vc-git-command, which uses vc-do-command -;; from vc-dispatcher. -(autoload 'vc-resynch-buffer "vc-dispatcher") - (defun vc-git-stash (name) "Create a stash." (interactive "sStash name: ") |