diff options
author | Raul Benencia <rul@kalgan.cc> | 2022-02-15 14:07:20 -0800 |
---|---|---|
committer | Raul Benencia <rul@kalgan.cc> | 2022-02-15 14:07:20 -0800 |
commit | 89124a08a1c27ee8d76e6b825f3ff0f70e2d1f8e (patch) | |
tree | ab16be0fc3b66383115d9f86a0245e8836b4429d /.alias.d/10-git | |
parent | 131c8bb2e0fca39fccea43887733b442e60d4a4c (diff) |
aliases: git
Diffstat (limited to '.alias.d/10-git')
-rw-r--r-- | .alias.d/10-git | 5 |
1 files changed, 3 insertions, 2 deletions
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' |