procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
when rebase or bisect are in progress.
This commit is contained in:
Dan Nicolaescu 2013-11-19 15:23:53 -05:00
parent a6e3a5d5d5
commit 826dc7b6b1
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
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.

5
lisp/vc/vc-git.el
View file

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