Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
826dc7b6
Commit
826dc7b6
authored
Nov 19, 2013
by
Dan Nicolaescu
Browse files
* vc/vc-git.el (vc-git-dir-extra-headers): Add headers
when rebase or bisect are in progress.
parent
a6e3a5d5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
0 deletions
+10
-0
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/vc/vc-git.el
lisp/vc/vc-git.el
+5
-0
No files found.
lisp/ChangeLog
View file @
826dc7b6
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.
...
...
lisp/vc/vc-git.el
View file @
826dc7b6
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment