|
|
@ -67,7 +67,6 @@ alias gir='git reset'
|
|
|
|
alias giR='git reset --keep'
|
|
|
|
alias giR='git reset --keep'
|
|
|
|
alias gix='git rm -r --cached'
|
|
|
|
alias gix='git rm -r --cached'
|
|
|
|
alias giX='git rm -rf --cached'
|
|
|
|
alias giX='git rm -rf --cached'
|
|
|
|
alias gig='git grep --cached'
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Konflict (k)
|
|
|
|
# Konflict (k)
|
|
|
|
alias gkl='git status | sed -n "s/^.*both [a-z]*ed: *//p"'
|
|
|
|
alias gkl='git status | sed -n "s/^.*both [a-z]*ed: *//p"'
|
|
|
|