mainly for r10k

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

diff --git a/.config/git/config b/.config/git/config
index 3c47240b8a8e7e0bb52547cd893968bed0548a44..bf56d483cc75a251837948a05bc46ec3e5107007 100644 (file)
--- a/.config/git/config
+++ b/.config/git/config
@@ -37,6 +37,8 @@
 [grep]
   # show linenumber (-n)
   lineNumber = true
+[init]
+  defaultBranch = main
 [log]
   # show short commit sha
   abbrevCommit = true
@@ -129,6 +131,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^