git.el: Use git-add-file for unmerged files, remove git-resolve-file
Use `git-add-file' to mark unmerged files as resolved in the *git-status* buffer to be consistent with git's CLI instructions. Also remove `git-resolve-file' to make it clear that that "R" is a now a free keybinding. Signed-off-by: Martin Nordholts <martinn@src.gnome.org> Acked-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Martin Nordholts committed
Sep 3, 2009 at 22:27 UTC
aaa68dd50f7b4226fdfdfbbe8bbb2dfd9a9e6d66
1 file changed
+1
-12
contrib/emacs/git.el
+1
-12
@@ -1046,7 +1046,7 @@ The FILES list must be sorted."
1046
(defun git-add-file ()
1047
"Add marked file(s) to the index cache."
1048
(interactive)
1049
- (let ((files (git-get-filenames (git-marked-files-state 'unknown 'ignored))))
1049
+ (let ((files (git-get-filenames (git-marked-files-state 'unknown 'ignored 'unmerged))))
1050
;; FIXME: add support for directories
1051
(unless files
1052
(push (file-relative-name (read-file-name "File to add: " nil nil t)) files))
@@ -1119,15 +1119,6 @@ The FILES list must be sorted."
1119
(when buffer (with-current-buffer buffer (revert-buffer t t t)))))
1120
(git-success-message "Reverted" names))))))
1121
1122
-(defun git-resolve-file ()
1123
- "Resolve conflicts in marked file(s)."
1124
- (interactive)
1125
- (let ((files (git-get-filenames (git-marked-files-state 'unmerged))))
1126
- (when files
1127
- (when (apply 'git-call-process-display-error "update-index" "--" files)
1128
- (git-update-status-files files)
1129
- (git-success-message "Resolved" files)))))
1130
-
1122
(defun git-remove-handled ()
1123
"Remove handled files from the status list."
1124
(interactive)
@@ -1556,7 +1547,6 @@ amended version of it."
1547
(define-key map "P" 'git-prev-unmerged-file)
1548
(define-key map "q" 'git-status-quit)
1549
(define-key map "r" 'git-remove-file)
1559
- (define-key map "R" 'git-resolve-file)
1550
(define-key map "t" toggle-map)
1551
(define-key map "T" 'git-toggle-all-marks)
1552
(define-key map "u" 'git-unmark-file)
@@ -1598,7 +1588,6 @@ amended version of it."
1588
("Merge"
1589
["Next Unmerged File" git-next-unmerged-file t]
1590
["Prev Unmerged File" git-prev-unmerged-file t]
1601
- ["Mark as Resolved" git-resolve-file t]
1591
["Interactive Merge File" git-find-file-imerge t]
1592
["Diff Against Common Base File" git-diff-file-base t]
1593
["Diff Combined" git-diff-file-combined t]