From b3d9e9da12fe22ae9cbadc874d0ac2b3aa872e38 Mon Sep 17 00:00:00 2001 From: Sloane Perrault Date: Fri, 30 Jun 2023 10:21:58 -0400 Subject: [PATCH] don't default to a force push --- .config/nvim/lua/keys.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.config/nvim/lua/keys.lua b/.config/nvim/lua/keys.lua index 6403ab3..8057aad 100644 --- a/.config/nvim/lua/keys.lua +++ b/.config/nvim/lua/keys.lua @@ -64,14 +64,14 @@ wk.register({ g = { 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 = { + p = { 'Git push -u origin head', 'Push' }, + P = { 'Git push -u origin head --force-with-lease', 'Push (force with lease)' }, + f = { name = 'fetch', o = { 'Git fetch origin', 'origin' }, u = { 'Git fetch upstream', 'upstream' }, }, - r = { + r = { name = 'rebase', o = { 'Git rebase origin/main', 'origin/main' }, O = { 'Git rebase --interactive origin/main', '-i origin/main' },