From 4a005b8f8c51732bab35300dfd824966e3df5a23 Mon Sep 17 00:00:00 2001 From: Andrew Tomaka Date: Tue, 22 Nov 2022 20:14:36 -0500 Subject: [PATCH] Minor fixes --- nvim/.config/nvim/lua/plugins.lua | 6 +++++- zsh/.config/zsh/aliases | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua index 0882acc..f126afb 100644 --- a/nvim/.config/nvim/lua/plugins.lua +++ b/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 diff --git a/zsh/.config/zsh/aliases b/zsh/.config/zsh/aliases index d34116f..8d4eb1f 100644 --- a/zsh/.config/zsh/aliases +++ b/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"