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

Move unpulled commits before local changes.

Browse source
This commit is contained in:
Marius Vollmer 2008-09-07 17:24:32 +03:00
parent 72fa30a698
commit e4ccc99536
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
magit.el
View file

@ -1108,13 +1108,14 @@ Please see the manual for a complete description of Magit.
(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-untracked-files) (magit-insert-untracked-files)
(when remote
(magit-insert-unpulled-commits remote branch))
(let ((staged (magit-anything-staged-p))) (let ((staged (magit-anything-staged-p)))
(magit-insert-unstaged-changes (magit-insert-unstaged-changes
(if staged "Unstaged changes:" "Changes:")) (if staged "Unstaged changes:" "Changes:"))
(if staged (if staged
(magit-insert-staged-changes))) (magit-insert-staged-changes)))
(when remote (when remote
(magit-insert-unpulled-commits remote branch)
(magit-insert-unpushed-commits remote branch))))) (magit-insert-unpushed-commits remote branch)))))
(magit-goto-line old-line) (magit-goto-line old-line)
(when (bobp) (when (bobp)