vim: add bindings for quit-another-window

[dotfiles.git] / zsh / aliases / git.zsh

diff --git a/zsh/aliases/git.zsh b/zsh/aliases/git.zsh
index 154aa6db1a4d686c65be2c4931c40eaac4d6bd8d..301a15abfb645e6a95cea181c6464b4eaf5beeac 100644 (file)
--- a/zsh/aliases/git.zsh
+++ b/zsh/aliases/git.zsh
@@ -10,10 +10,13 @@ compdef _git gup=git-fetch
 alias gp='git push'
 compdef _git gp=git-push
 alias gd='git diff'
-gdv() { git diff -w "$@" | view - }
-compdef _git gdv=git-diff
+alias gdc='git diff --cached'
 alias gc='git commit -v'
 compdef _git gc=git-commit
+alias gcs='git commit -v --squash'
+compdef _git gcs=git-commit
+alias gcf='git commit -v --fixup'
+compdef _git gcf=git-commit
 alias gca='git commit -v -a'
 compdef _git gca=git-commit
 alias gco='git checkout'
@@ -40,11 +43,14 @@ compdef gcount=git
 alias gcl='git config --list'
 alias gcp='git cherry-pick'
 compdef _git gcp=git-cherry-pick
-alias glg='git log --stat --max-count=5'
+alias glg='git --no-pager log --oneline --graph --max-count=20 --decorate'
+alias glg='git --no-pager log --graph --max-count=20 --pretty=tformat:"%Cblue%cd %C(auto)%h%d %s" --date=short'
 compdef _git glg=git-log
-alias glgg='git log --graph --max-count=5'
+alias glgl='git log --graph --pretty=tformat:"%Cblue%cd %C(auto)%h%d %s" --date=short'
+compdef _git glgl=git-log
+alias glgg='git log --stat --graph --max-count=20 --decorate'
 compdef _git glgg=git-log
-alias glgga='git log --graph --decorate --all'
+alias glgga='git log --stat --graph --decorate --all'
 compdef _git glgga=git-log
 alias gss='git status -s'
 compdef _git gss=git-status