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

Unrewritten changes. (R)

Browse source
This commit is contained in:
Marius Vollmer 2008-09-07 23:29:44 +03:00
parent 1b6133b622
commit 993354b867
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
magit.el
View file

@ -1100,6 +1100,7 @@ Please see the manual for a complete description of Magit.
(if rebase
(insert (apply 'format "Rebasing: %s (%s of %s)\n" rebase))))
(insert "\n")
(magit-insert-unrewritten-changes)
(magit-insert-pending-commits)
(when remote
(magit-insert-unpulled-commits remote branch))
@ -1290,6 +1291,15 @@ Please see the manual for a complete description of Magit.
"\n"))))
(insert "\n"))))
(defun magit-insert-unrewritten-changes ()
(let* ((info (magit-read-rewrite-info))
(orig (cadr (assq 'orig info))))
(when orig
(magit-insert-section 'unrewritten
"Unrewritten changes"
'magit-wash-diff nil
"git" "diff" "-R" orig))))
(defun magit-rewrite-start (from &optional onto)
(interactive (list (magit-read-rev "Rewrite from" (magit-default-rev))))
(or (magit-everything-clean-p)