merge-main, neovim from source, aliases

2024-03-07 08:57:49 -05:00
parent a3899f3930
commit 5cb8ae2fc1
4 changed files with 31 additions and 9 deletions
--- a/zsh/merge-main.sh
+++ b/zsh/merge-main.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/bash -e
+branch=$(git status|head -1|cut -f3 -d\ )
+git checkout main
+git pull
+git checkout "$branch"
+git merge main