From 5b2dcb884481f82dfdea6b2495b8525a17c23156 Mon Sep 17 00:00:00 2001 From: Sorin Ionescu Date: Mon, 1 Oct 2012 22:14:33 -0400 Subject: [PATCH] Rename gk prefixed aliases to gC --- modules/git/alias.zsh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/git/alias.zsh b/modules/git/alias.zsh index 4e47ea9d..f67dd69c 100644 --- a/modules/git/alias.zsh +++ b/modules/git/alias.zsh @@ -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'