@ -30,6 +30,8 @@
fixup = rebase -i --autosquash
l = log
ll = log --oneline -n 5
lm = logme
logme = !sh -c 'git log --author=\"$(git config --get user.name)\"'
ls = !git branch --format '%(refname:short)' | fzf
mr = !git merge $(git rb)
mt = merge -s recursive -X theirs