don't default to a force push

This commit is contained in:
Sloane Perrault 2023-06-30 10:21:58 -04:00
parent 0e9674245b
commit b3d9e9da12
No known key found for this signature in database

View file

@ -64,14 +64,14 @@ wk.register({
g = { g = {
name = 'git', name = 'git',
s = { '<cmd>Git<cr>', 'Status' }, s = { '<cmd>Git<cr>', 'Status' },
p = { '<cmd>Git push --force-with-lease -u origin head<cr>', 'Push' }, p = { '<cmd>Git push -u origin head<cr>', 'Push' },
P = { '<cmd>Git push -u origin head<cr>', 'Push (force with lease)' }, P = { '<cmd>Git push -u origin head --force-with-lease<cr>', 'Push (force with lease)' },
f = { f = {
name = 'fetch', name = 'fetch',
o = { '<cmd>Git fetch origin<cr>', 'origin' }, o = { '<cmd>Git fetch origin<cr>', 'origin' },
u = { '<cmd>Git fetch upstream<cr>', 'upstream' }, u = { '<cmd>Git fetch upstream<cr>', 'upstream' },
}, },
r = { r = {
name = 'rebase', name = 'rebase',
o = { '<cmd>Git rebase origin/main<cr>', 'origin/main' }, o = { '<cmd>Git rebase origin/main<cr>', 'origin/main' },
O = { '<cmd>Git rebase --interactive origin/main<cr>', '-i origin/main' }, O = { '<cmd>Git rebase --interactive origin/main<cr>', '-i origin/main' },