diff options
| -rw-r--r-- | .alias.d/10-git | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.alias.d/10-git b/.alias.d/10-git index 6ed7a50..9bb1906 100644 --- a/.alias.d/10-git +++ b/.alias.d/10-git @@ -126,6 +126,7 @@ alias gwch='git whatchanged -p --abbrev-commit --pretty=medium' alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit -m "--wip--"' alias git-delete-merged-branches='git branch --merged | grep -v "\*" | grep -v master | xargs -n 1 git branch -d' alias gfrh='git fetch && git reset --hard "origin/$(git rev-parse --abbrev-ref HEAD)"' +alias gfr='git fetch upstream && git rebase upstream/master' # mr alias ms='mr -m status' |