Improvment for git

* highlight for untracked files in commit
* rebase fixes (noop, commit ids, colors)
* .gitconfig syntax
This commit is contained in:
Mariusz Smykuła 2013-06-01 22:51:09 +02:00
parent c2fbddca7a
commit 297a5fcbdc

View File

@ -28,6 +28,9 @@ color green "#[[:space:]]modified:"
color brightgreen "#[[:space:]]new file:" color brightgreen "#[[:space:]]new file:"
color brightblue "#[[:space:]]renamed:" color brightblue "#[[:space:]]renamed:"
# Untracked filenames
color blue "^# [^/?*:;{}\\]+$"
# Recolor hash symbols # Recolor hash symbols
color brightblack "#" color brightblack "#"
@ -41,24 +44,37 @@ syntax "git rebase todo" "git-rebase-todo"
color white ".*" color white ".*"
# Comments # Comments
color brightblack "^#.*" color brightblack "^#.*"
color brightred "^noop$"
# Commit IDs
color brightwhite "[0-9a-f]{7,40}"
# Rebase commands # Rebase commands
color green "^(e|edit) [0-9a-f]{7,40}" color green "^(e|edit) [0-9a-f]{7,40}"
color green "^# (e, edit)" color green "^# (e, edit)"
color brightgreen "^(f|fixup) [0-9a-f]{7,40}" color brightgreen "^(f|fixup) [0-9a-f]{7,40}"
color brightgreen "^# (f, fixup)" color brightgreen "^# (f, fixup)"
color brightwhite "^(p|pick) [0-9a-f]{7,40}" color brightmagenta "^(p|pick) [0-9a-f]{7,40}"
color brightwhite "^# (p, pick)" color brightmagenta "^# (p, pick)"
color blue "^(r|reword) [0-9a-f]{7,40}" color blue "^(r|reword) [0-9a-f]{7,40}"
color blue "^# (r, reword)" color blue "^# (r, reword)"
color brightred "^(s|squash) [0-9a-f]{7,40}" color brightcyan "^(s|squash) [0-9a-f]{7,40}"
color brightred "^# (s, squash)" color brightcyan "^# (s, squash)"
color yellow "^(x|exec) [^ ]+ [0-9a-f]{7,40}" color yellow "^(x|exec) [^ ]+ [0-9a-f]{7,40}"
color yellow "^# (x <cmd>, exec <cmd>)" color yellow "^# (x, exec)"
# Recolor hash symbols # Recolor hash symbols
color brightblack "#" color brightblack "#"
# Commit IDs
color white "[0-9a-f]{7,40}"
# Derived from https://github.com/craigbarnes/nanorc
syntax "gitconfig" "git(config|modules)$|\.git/config$"
color brightcyan "\<(true|false)\>"
color cyan "^[[:space:]]*[^=]*="
color brightmagenta "^[[:space:]]*\[.*\]$"
color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
color brightblack "(^|[[:space:]])#([^{].*)?$"
color ,green "[[:space:]]+$"
color ,red " +"