summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.config/git/config9
1 files changed, 5 insertions, 4 deletions
diff --git a/.config/git/config b/.config/git/config
index aac12ae..54452a8 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -121,10 +121,11 @@
remp = remote prune
remu = remote update
- rb = rebase
- rba = rebase --abort
- rbc = rebase --continue
- rbi = rebase --interactive
+ frbp = "!f() { git fetch; git rebase "$1"; git push --force-with-lease; }; f"
+ rb = rebase
+ rba = rebase --abort
+ rbc = rebase --continue
+ rbi = rebase --interactive
r = reset
r1 = reset HEAD^