Zander671/emacs-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add merge message to eshell prompt

Browse Source
This commit is contained in:
Alexander Rosenberg 2024-01-09 21:49:34 -08:00
parent 67fdc1c341
commit caeed32623
Signed by: Zander671
GPG Key ID: 5FD0394ADBD72730
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
init.el
View File

@ -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)))