qutebrowser: lazy_restore tabs

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

diff --git a/zsh/aliases/git.zsh b/zsh/aliases/git.zsh
index dbf552e35f28a1afc82cfef103f420d03d011019..f18d8842ed373d0ba9a5355327c901273f0ceb4c 100644 (file)
--- a/zsh/aliases/git.zsh
+++ b/zsh/aliases/git.zsh
@@ -28,7 +28,7 @@ alias gs='git stash save'
 alias gsa='git stash apply'
 alias gsp='git stash pop'
 alias gsd='git stash drop'
 alias gsa='git stash apply'
 alias gsp='git stash pop'
 alias gsd='git stash drop'

-alias gsl='git --no-pager stash list'
+alias gsl='git --no-pager log -g --oneline --pretty=tformat:"%gd %Cblue%cd %C(auto)%h %s" stash@{0} --date=short'

 alias gss='git stash show --patch'
 
 alias gr='git remote'
 alias gss='git stash show --patch'
 
 alias gr='git remote'


@@ -47,14 +47,16 @@ alias gcl='git config --list'
 alias gcp='git cherry-pick'
 
 alias gcount='git shortlog -sn'
 alias gcp='git cherry-pick'
 
 alias gcount='git shortlog -sn'

-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'
+alias glg='git --no-pager log --graph --max-count=20 --format="%Cblue%cd %C(auto)%h%d %s" --date=short'
+alias glg2='git --no-pager log --graph --max-count=20 --date=short --format="%C(blue)%cd %C(auto)%h %C(dim cyan)%an %C(bold green)(%ar)%C(auto)%-d%n %s"'

 function glm { glg "${1:-origin}".. }
 compdef _git glm=git-log
 function glm { glg "${1:-origin}".. }
 compdef _git glm=git-log

-alias glgl='git log --graph --pretty=tformat:"%Cblue%cd %C(auto)%h%d %s" --date=short'
+alias glgl='git log --graph --cherry-mark --boundary --pretty=tformat:"%Cblue%cd %C(auto)%h%d %s" --date=short'

 alias glgg='git log --stat --graph --max-count=20 --decorate'
 alias glgga='git log --stat --graph --decorate --all'
 
 alias glgg='git log --stat --graph --max-count=20 --decorate'
 alias glgga='git log --stat --graph --decorate --all'
 

+alias grl='git --no-pager reflog --max-count=20'
+

 alias ga='git add'
 
 alias gm='git merge'
 alias ga='git add'
 
 alias gm='git merge'