sjs/config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add ecf=git edit-conflicted-files mate

Browse source
This commit is contained in:
Sami Samhuri 2015-07-23 23:28:34 -07:00
parent f3b10c1292
commit 19daad760c
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
zshrc
View file

@ -217,9 +217,6 @@ alias irb='irb --readline -r irb/completion'
# git # git
if command_exists git; then if command_exists git; then
if command_exists hub; then
eval "$(hub alias -s)"
fi
alias a='git add' alias a='git add'
alias b='git branch' alias b='git branch'
alias c='git commit' alias c='git commit'
@ -230,6 +227,7 @@ if command_exists git; then
alias dc='git diff --cached' alias dc='git diff --cached'
alias dmcr='git diff-merge-conflict-resolution' alias dmcr='git diff-merge-conflict-resolution'
alias ds='git diff --stat' alias ds='git diff --stat'
alias ecf='git edit-conflicted-files mate'
alias f='git fetch' alias f='git fetch'
alias gl='git log' alias gl='git log'
alias glo='git log --oneline --decorate' alias glo='git log --oneline --decorate'