|
|
@@ -78,13 +78,14 @@ alias df='df -hx tmpfs'
|
|
|
alias du='du --max-depth=1'
|
|
|
alias fd='fdfind'
|
|
|
alias sr='screen -r'
|
|
|
+alias gil='git log --graph --abbrev-commit --stat --summary -C --decorate --date=local'
|
|
|
+alias giw='git show -C --date=local --decorate'
|
|
|
alias gip='git pull --ff-only'
|
|
|
alias gib='git branch'
|
|
|
alias gis='git status'
|
|
|
alias gid='git diff -C --date=local'
|
|
|
alias gic='git checkout'
|
|
|
alias giu='git reset HEAD\^'
|
|
|
-alias gn='git number'
|
|
|
alias hgw='hg diff --change .'
|
|
|
alias class='xprop -notype WM_CLASS'
|
|
|
alias tree='tree -AvL 10'
|
|
|
@@ -153,13 +154,6 @@ else
|
|
|
PROMPT+=$'%{$reset_color%} \n%(!.#.\$) '
|
|
|
fi
|
|
|
|
|
|
-if builtin which gil > /dev/null; then
|
|
|
- alias giw='gil --show'
|
|
|
-else
|
|
|
- alias gil='git log --graph --abbrev-commit --stat --summary -C --decorate --date=local'
|
|
|
- alias giw='git show -C --date=local --decorate'
|
|
|
-fi
|
|
|
-
|
|
|
if [ -x /usr/bin/fzf ]; then
|
|
|
FZF_DEFAULT_OPTS='--no-mouse'
|
|
|
source "/usr/share/doc/fzf/examples/key-bindings.zsh"
|