diff --git a/.gitconfig b/.gitconfig index 02f4fec4..91738f18 100644 --- a/.gitconfig +++ b/.gitconfig @@ -100,7 +100,8 @@ ############# ls = ls-files lsf = !git ls-files | grep -i - ############# + ############# + m = merge mm = merge --no-ff -m "🔀 merge: Merge branch '$(git symbolic-ref --short HEAD)' into '$(git branch --show-current)'" ma = merge --abort mc = merge --continue