sqozz/prezto_config
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Rename gk prefixed aliases to gC

Browse source
This commit is contained in:
Sorin Ionescu 2012-10-01 22:14:33 -04:00
parent 4c116cb4d2
commit 5b2dcb8844
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
modules/git/alias.zsh
View file

@ -81,14 +81,14 @@ alias giR='git reset --keep'
alias gix='git rm -r --cached'
alias giX='git rm -rf --cached'
# Konflict (k)
alias gkl='git status | sed -n "s/^.*both [a-z]*ed: *//p"'
alias gka='git add $(gkl)'
alias gke='git mergetool $(gkl)'
alias gko='git checkout --ours --'
alias gkO='gko $(gkl)'
alias gkt='git checkout --theirs --'
alias gkT='gkt $(gkl)'
# Conflict (C)
alias gCl='git status | sed -n "s/^.*both [a-z]*ed: *//p"'
alias gCa='git add $(gCl)'
alias gCe='git mergetool $(gCl)'
alias gCo='git checkout --ours --'
alias gCO='gCo $(gCl)'
alias gCt='git checkout --theirs --'
alias gCT='gCt $(gCl)'
# Log (l)
git_log_format_medium='--pretty=format:%C(bold)Commit:%C(reset) %C(green)%H%C(red)%d%n%C(bold)Author:%C(reset) %C(cyan)%an <%ae>%n%C(bold)Date:%C(reset) %C(blue)%ai (%ar)%C(reset)%n%+B'