aboutsummaryrefslogtreecommitdiff
path: root/.alias.d/10-git
diff options
context:
space:
mode:
authorRaul Benencia <rul@kalgan.cc>2023-01-23 08:37:47 -0800
committerRaul Benencia <rul@kalgan.cc>2023-01-23 08:38:06 -0800
commit0306ea1c9a813344bf6b6dca52f1ac50422f4e3b (patch)
tree5a1d05bddca564b983816289049170c55c28bd3d /.alias.d/10-git
parent05fa1ef9e136ec7ed5be2c33a754c24973fa3544 (diff)
bash: alias for fetch and rebase
Diffstat (limited to '.alias.d/10-git')
-rw-r--r--.alias.d/10-git1
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'
nihil fit ex nihilo