undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git.el: Add support for interactive diffs.

Browse Source 
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Alexandre Julliard 2007-08-11 12:22:47 +02:00 committed by Junio C Hamano
parent 04d70bebe7
commit 09afcd6933
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/emacs/git.el
View File

@ -965,7 +965,13 @@ Return the list of files that haven't been handled."
(defun git-diff-file-idiff ()
"Perform an interactive diff on the current file."
(interactive)
(error "Interactive diffs not implemented yet."))
(let ((files (git-marked-files-state 'added 'deleted 'modified)))
(unless (eq 1 (length files))
(error "Cannot perform an interactive diff on multiple files."))
(let* ((filename (car (git-get-filenames files)))
(buff1 (find-file-noselect filename))
(buff2 (git-run-command-buffer (concat filename ".~HEAD~") "cat-file" "blob" (concat "HEAD:" filename))))
(ediff-buffers buff1 buff2))))
(defun git-log-file ()
"Display a log of changes to the marked file(s)."