gwh/slackbuilds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Diffing with branches.

Browse source 
* magit.el (magit-diff-with-branch): New.
This commit is contained in:
Marius Vollmer 2008-08-12 03:14:54 +03:00
parent 087e1b47bc
commit 8c4b0f9184
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
magit.el
View file

@ -229,6 +229,7 @@
(define-key magit-mode-map (kbd "C") 'magit-add-log) (define-key magit-mode-map (kbd "C") 'magit-add-log)
(define-key magit-mode-map (kbd "l") 'magit-browse-log) (define-key magit-mode-map (kbd "l") 'magit-browse-log)
(define-key magit-mode-map (kbd "L") 'magit-browse-branch-log) (define-key magit-mode-map (kbd "L") 'magit-browse-branch-log)
(define-key magit-mode-map (kbd "d") 'magit-diff-with-branch)
(define-key magit-mode-map (kbd "p") 'magit-display-process)) (define-key magit-mode-map (kbd "p") 'magit-display-process))
(defvar magit-mode-hook nil) (defvar magit-mode-hook nil)
@ -822,7 +823,7 @@ the current line into your working tree.
;;; Diffing ;;; Diffing
(defun magit-show-diff (start end) (defun magit-show-diff (from to)
(let ((dir default-directory) (let ((dir default-directory)
(buf (get-buffer-create "*magit-diff*"))) (buf (get-buffer-create "*magit-diff*")))
(display-buffer buf) (display-buffer buf)
@ -833,7 +834,11 @@ the current line into your working tree.
(let ((inhibit-read-only t)) (let ((inhibit-read-only t))
(erase-buffer) (erase-buffer)
(magit-insert-section 'diff nil 'magit-wash-diff (magit-insert-section 'diff nil 'magit-wash-diff
"git" "diff" start end))))) "git" "diff" from to)))))
(defun magit-diff-with-branch (branch)
(interactive (list (magit-read-rev "Diff HEAD against: ")))
(magit-show-diff "HEAD" branch))
;;; Markers ;;; Markers