Commit 826dc7b6 authored by Dan Nicolaescu's avatar Dan Nicolaescu

* vc/vc-git.el (vc-git-dir-extra-headers): Add headers

when rebase or bisect are in progress.
parent a6e3a5d5
2013-11-19 Dan Nicolaescu <dann@gnu.org>
* vc/vc-git.el (vc-git-dir-extra-headers): Add headers
when rebase or bisect are in progress.
2013-11-19 Xue Fuqiao <xfq.free@gmail.com>
* filenotify.el (file-notify-add-watch): Doc fix.
......
......@@ -559,6 +559,11 @@ or an empty string if none."
(propertize remote-url
'face 'font-lock-variable-name-face)))
"\n"
;; For now just a heading, key bindings can be added later for various bisect actions
(when (file-exists-p (expand-file-name ".git/BISECT_START" (vc-git-root _dir)))
(propertize "Bisect : in progress\n" 'face 'font-lock-warning-face))
(when (file-exists-p (expand-file-name ".git/rebase-apply" (vc-git-root _dir)))
(propertize "Rebase : in progress\n" 'face 'font-lock-warning-face))
(if stash
(concat
(propertize "Stash :\n" 'face 'font-lock-type-face
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment