about summary refs log tree commit diff
path: root/.config
diff options
context:
space:
mode:
authorStarfall <us@starfall.systems>2021-08-05 12:43:24 -0500
committerStarfall <us@starfall.systems>2021-08-05 12:43:24 -0500
commit739f1f6984792250dcedb6f558cfa42bd11138b6 (patch)
treed86214f2b5ec306eee5eb8debdbe45a407f5be4a /.config
parent3458532f0d026a16e9d1566a8d4441b341cbba0b (diff)
git: add 'rebranch' alias to update main & rebase current branch onto it
Diffstat (limited to '.config')
-rw-r--r--.config/git/config1
1 files changed, 1 insertions, 0 deletions
diff --git a/.config/git/config b/.config/git/config
index f4113d9..fd8b7ff 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -18,6 +18,7 @@
 	clean = !git remote prune origin && git branch | xargs git branch -d
 	force = push --force-with-lease
 	oops = commit --all --amend --no-edit
+	rebranch = !git checkout main && git pull && git checkout - && git rebase main
 	stashpull = !git stash && git pull && git stash pop
 	stat = status
 	tree = log --all --graph --oneline