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

Renamed "unmerged" to "unpulled".

Browse source
This commit is contained in:
Marius Vollmer 2008-09-07 16:50:30 +03:00
parent 8c09f66694
commit 72fa30a698
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

@ -1062,9 +1062,9 @@ Please see the manual for a complete description of Magit.
(or magit-marked-commit
(error "Not commit marked")))
(defun magit-insert-unmerged-commits (remote branch)
(magit-insert-section 'unmerged
"Unmerged commits:" 'magit-wash-log
(defun magit-insert-unpulled-commits (remote branch)
(magit-insert-section 'unpulled
"Unpulled commits:" 'magit-wash-log
nil
"git" "log" "--graph" "--pretty=oneline"
(format "HEAD..%s/%s" remote branch)))
@ -1114,7 +1114,7 @@ Please see the manual for a complete description of Magit.
(if staged
(magit-insert-staged-changes)))
(when remote
(magit-insert-unmerged-commits remote branch)
(magit-insert-unpulled-commits remote branch)
(magit-insert-unpushed-commits remote branch)))))
(magit-goto-line old-line)
(when (bobp)