diff options
| -rw-r--r-- | .alias.d/00-general | 1 | ||||
| -rw-r--r-- | .alias.d/10-git | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.alias.d/00-general b/.alias.d/00-general index 2df728c..68a23b1 100644 --- a/.alias.d/00-general +++ b/.alias.d/00-general @@ -1,7 +1,6 @@ # aliases alias grep='grep --color' alias psc='ps xawf -eo pid,user,cgroup,args' -alias gcm='git checkout master && git fetch upstream && git reset --hard upstream/master && git push origin master' alias df='df -h -x none' alias free='free -m' diff --git a/.alias.d/10-git b/.alias.d/10-git index d067f8d..b6f5caa 100644 --- a/.alias.d/10-git +++ b/.alias.d/10-git @@ -29,8 +29,7 @@ alias gcf='git config --list' alias gcl='git clone --recursive' alias gclean='git clean -fd' alias gpristine='git reset --hard && git clean -dfx' -#alias gcm='git checkout master' -#alias gcmsg='git commit -m' +alias gcm='git checkout master && git fetch upstream && git reset --hard upstream/master' alias gco='git checkout' alias gcount='git shortlog -sn' @@ -46,6 +45,7 @@ alias gdw='git diff --word-diff' alias gf='git fetch' alias gfa='git fetch --all --prune' alias gfo='git fetch origin' +alias gfu='git fetch upstream' alias gg='git gui citool' alias gga='git gui citool --amend' @@ -85,6 +85,7 @@ alias grb='git rebase' alias grba='git rebase --abort' alias grbc='git rebase --continue' alias grbi='git rebase -i' +alias grbum='git rebase upstream/master' alias grbm='git rebase master' alias grbs='git rebase --skip' alias grh='git reset HEAD' |