merge-main, neovim from source, aliases

zsh/.zshrc

@@ -28,6 +28,9 @@ else
 fi
 
 alias pls='sudo'
+alias mm='merge-main.sh'
+alias gmc='git merge --continue'
+alias kci='git commit --allow-empty --message "kick CI" && git push'
 alias cddf='cd $HOME/.dotfiles'
 alias nvdf='cddf && nvim $HOME/.dotfiles/README.md'
 alias cdjb='cd $HOME/src/github.com/jbohanon'

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