mirror of https://github.com/ohmyzsh/ohmyzsh.git
Compare commits
4 Commits
506471bed8
...
d09641809a
Author | SHA1 | Date |
---|---|---|
|
d09641809a | |
|
6e7ac0544e | |
|
03a0d25ed5 | |
|
9795938b32 |
|
@ -89,6 +89,7 @@ plugins=(... git)
|
|||
| `gdup` | `git diff @{upstream}` |
|
||||
| `gdnolock` | `git diff $@ ":(exclude)package-lock.json" ":(exclude)\*.lock"` |
|
||||
| `gdt` | `git diff-tree --no-commit-id --name-only -r` |
|
||||
| `gdss` | `git diff --shortstat $(git_main_branch)..$(git_current_branch)` |
|
||||
| `gf` | `git fetch` |
|
||||
| `gfa` | `git fetch --all --tags --prune` |
|
||||
| `gfo` | `git fetch origin` |
|
||||
|
|
|
@ -206,6 +206,7 @@ alias gdca='git diff --cached'
|
|||
alias gdcw='git diff --cached --word-diff'
|
||||
alias gds='git diff --staged'
|
||||
alias gdw='git diff --word-diff'
|
||||
alias gdss="git diff --shortstat $(git_main_branch)..$(git_current_branch)"
|
||||
|
||||
function gdv() { git diff -w "$@" | view - }
|
||||
compdef _git gdv=git-diff
|
||||
|
|
|
@ -35,8 +35,14 @@
|
|||
CURRENT_BG='NONE'
|
||||
|
||||
case ${SOLARIZED_THEME:-dark} in
|
||||
light) CURRENT_FG='white';;
|
||||
*) CURRENT_FG='black';;
|
||||
light)
|
||||
CURRENT_FG='white'
|
||||
CURRENT_DEFAULT_FG='white'
|
||||
;;
|
||||
*)
|
||||
CURRENT_FG='black'
|
||||
CURRENT_DEFAULT_FG='default'
|
||||
;;
|
||||
esac
|
||||
|
||||
### Theme Configuration Initialization
|
||||
|
@ -48,7 +54,7 @@ esac
|
|||
: ${AGNOSTER_DIR_BG:=blue}
|
||||
|
||||
# user@host
|
||||
: ${AGNOSTER_CONTEXT_FG:=white}
|
||||
: ${AGNOSTER_CONTEXT_FG:=${CURRENT_DEFAULT_FG}}
|
||||
: ${AGNOSTER_CONTEXT_BG:=black}
|
||||
|
||||
# Git related
|
||||
|
@ -85,7 +91,7 @@ esac
|
|||
: ${AGNOSTER_STATUS_RETVAL_FG:=red}
|
||||
: ${AGNOSTER_STATUS_ROOT_FG:=yellow}
|
||||
: ${AGNOSTER_STATUS_JOB_FG:=cyan}
|
||||
: ${AGNOSTER_STATUS_FG:=white}
|
||||
: ${AGNOSTER_STATUS_FG:=${CURRENT_DEFAULT_FG}}
|
||||
: ${AGNOSTER_STATUS_BG:=black}
|
||||
|
||||
## Non-Color settings - set to 'true' to enable
|
||||
|
|
Loading…
Reference in New Issue