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

Experimental showing of unmerged commits.

Browse source 
* magit.el (magit-insert-unmerged-commits): New.
(magit-update-status): Use it.
This commit is contained in:
Marius Vollmer 2008-09-07 16:48:44 +03:00
parent 6b839c8df0
commit 8c09f66694
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
magit.el
View file

@ -1062,6 +1062,13 @@ 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
nil
"git" "log" "--graph" "--pretty=oneline"
(format "HEAD..%s/%s" remote branch)))
(defun magit-insert-unpushed-commits (remote branch)
(magit-insert-section 'unpushed
"Unpushed commits:" 'magit-wash-log
@ -1106,8 +1113,9 @@ Please see the manual for a complete description of Magit.
(if staged "Unstaged changes:" "Changes:"))
(if staged
(magit-insert-staged-changes)))
(if remote
(magit-insert-unpushed-commits remote branch)))))
(when remote
(magit-insert-unmerged-commits remote branch)
(magit-insert-unpushed-commits remote branch)))))
(magit-goto-line old-line)
(when (bobp)
(magit-goto-section '(unstaged)))