Minor fixes

nvim/.config/nvim/lua/plugins.lua

@@ -2,7 +2,11 @@ local ensure_packer = function()
   local fn = vim.fn
   local install_path = fn.stdpath('data')..'/site/pack/packer/start/packer.nvim'
   if fn.empty(fn.glob(install_path)) > 0 then
-    fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path})
+    fn.system({
+      'git', 'clone', '--depth', '1',
+      'https://github.com/wbthomason/packer.nvim',
+      install_path
+    })
     vim.cmd [[packadd packer.nvim]]
     return true
   end

zsh/.config/zsh/aliases

@@ -39,6 +39,7 @@ alias gm="git merge"
 alias gma="git merge --abort"
 alias gmc="git merge --continue"
 alias gmr="git most-recent-by-branch"
+alias gms="git merge --squash"
 alias gp="git push"
 alias gpf="git push --force"
 alias gpl="git pull"