From fa0e6ada1816c53d7eafc00580686c3d5f5dae18 Mon Sep 17 00:00:00 2001
From: Hendrik Jäger <hendrik.jaeger@dswiss.com>
Date: Mon, 8 Nov 2021 12:03:40 +0100
Subject: Rebasing and merging is a common workflow

---
 .config/git/config | 1 +
 1 file changed, 1 insertion(+)

(limited to '.config/git')

diff --git a/.config/git/config b/.config/git/config
index 3c47240..bfc11d3 100644
--- 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^
-- 
cgit v1.2.3