]> git.netwichtig.de Git - user/henk/vcsh/git.git/commitdiff
projects / user / henk / vcsh / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 956940b)
Rebasing and merging is a common workflow
authorHendrik Jäger <hendrik.jaeger@dswiss.com>
Mon, 8 Nov 2021 11:03:40 +0000 (12:03 +0100)
committerHendrik Jäger <gitcommit@henk.geekmail.org>
Tue, 21 Dec 2021 12:38:22 +0000 (13:38 +0100)
.config/git/config patch | blob | history

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^