From 87eb2cf7dd40a5a68b10a533e87630c138fb24eb Mon Sep 17 00:00:00 2001 From: Sloane Perrault Date: Mon, 1 May 2023 12:32:57 -0400 Subject: [PATCH] don't default to a force push --- .config/fish/config.fish | 3 ++- .config/nvim/lua/keys.lua | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 3bbb7c4..354eabd 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -21,7 +21,8 @@ abbr -a gcb git checkout -b abbr -a gco git checkout abbr -a gd git diff abbr -a gf git fetch -abbr -a gp git push --force-with-lease +abbr -a gp git push +abbr -a gP git push --force-with-lease abbr -a gpl git pull abbr -a gplr git pull --rebase abbr -a gr git rebase diff --git a/.config/nvim/lua/keys.lua b/.config/nvim/lua/keys.lua index d231a09..6403ab3 100644 --- a/.config/nvim/lua/keys.lua +++ b/.config/nvim/lua/keys.lua @@ -65,6 +65,7 @@ wk.register({ name = 'git', s = { 'Git', 'Status' }, p = { 'Git push --force-with-lease -u origin head', 'Push' }, + P = { 'Git push -u origin head', 'Push (force with lease)' }, f = { name = 'fetch', o = { 'Git fetch origin', 'origin' },