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

Renamed "Unrewritten changes" to "Pending changes".

Browse source
This commit is contained in:
Marius Vollmer 2008-09-08 23:39:55 +03:00
parent c9a4735c11
commit 998638ff1a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
magit.el
View file

@ -1115,7 +1115,7 @@ Please see the manual for a complete description of Magit.
(if rebase (if rebase
(insert (apply 'format "Rebasing: %s (%s of %s)\n" rebase)))) (insert (apply 'format "Rebasing: %s (%s of %s)\n" rebase))))
(insert "\n") (insert "\n")
(magit-insert-unrewritten-changes) (magit-insert-pending-changes)
(magit-insert-pending-commits) (magit-insert-pending-commits)
(when remote (when remote
(magit-insert-unpulled-commits remote branch)) (magit-insert-unpulled-commits remote branch))
@ -1306,13 +1306,13 @@ Please see the manual for a complete description of Magit.
"\n")))) "\n"))))
(insert "\n")))) (insert "\n"))))
(defun magit-insert-unrewritten-changes () (defun magit-insert-pending-changes ()
(let* ((info (magit-read-rewrite-info)) (let* ((info (magit-read-rewrite-info))
(orig (cadr (assq 'orig info)))) (orig (cadr (assq 'orig info))))
(when orig (when orig
(let ((magit-hide-diffs t)) (let ((magit-hide-diffs t))
(magit-insert-section 'unrewritten (magit-insert-section 'pending-changes
"Unrewritten changes" "Pending changes"
'magit-wash-diffs nil 'magit-wash-diffs nil
"git" "diff" "-R" orig))))) "git" "diff" "-R" orig)))))