From caeed3262302c983090efd7255de342bc3017205 Mon Sep 17 00:00:00 2001 From: Alexander Rosenberg Date: Tue, 9 Jan 2024 21:49:34 -0800 Subject: [PATCH] Add merge message to eshell prompt --- init.el | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/init.el b/init.el index 380263e..6aad710 100644 --- a/init.el +++ b/init.el @@ -929,7 +929,9 @@ If no name is given, list all bookmarks instead." ((= status-char ?D) (add-to-list 'status-arr ?)) ((= status-char ?R) - (add-to-list 'status-arr ?»))))) + (add-to-list 'status-arr ?»)) + ((= status-char ?U) + (add-to-list 'status-arr ?=))))) (sort status-arr #'<) (when branch-status (push branch-status status-arr)) @@ -941,7 +943,9 @@ If no name is given, list all bookmarks instead." ((file-exists-p (expand-file-name "REVERT_HEAD" git-dir)) "REVERTING") ((file-exists-p (expand-file-name "rebase-merge" git-dir)) - "REBASING")))) + "REBASING") + ((file-exists-p (expand-file-name "MERGE_HEAD" git-dir)) + "MERGING")))) (defun my/-eshell-prompt-git-status () "Get git status for `my/-eshell-prompt-function'" (let ((branch (car (vc-git-branches)))