Rebasing and merging is a common workflow

[user/henk/vcsh/git.git] / .config / git / config

diff --git a/.config/git/config b/.config/git/config
index 3c47240b8a8e7e0bb52547cd893968bed0548a44..bfc11d32f69d8d143e46c39f2c0df3a693a5ab82 100644 (file)
--- a/.config/git/config
+++ b/.config/git/config
@@ -129,6 +129,7 @@
   rba  = rebase --abort
   rbc  = rebase --continue
   rbi  = rebase --interactive
+  rbm = "!f() { git switch "$1" && git rebase - && git switch - && git merge -; }; f"
 
   r   = reset
   r1  = reset HEAD^