From 72fa30a698cbfd7dd2697b79b35b9371391801e8 Mon Sep 17 00:00:00 2001 From: Marius Vollmer Date: Sun, 7 Sep 2008 16:50:30 +0300 Subject: [PATCH] Renamed "unmerged" to "unpulled". --- magit.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/magit.el b/magit.el index 1852b438..35f0377e 100644 --- a/magit.el +++ b/magit.el @@ -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)