Merge pull request #1807 from Alvaro-Kothe/fix/force-with-lease

Author: CKolkey

lua/neogit/popups/push/actions.lua

@@ -51,9 +51,9 @@ local function push_to(args, remote, branch, opts)
   if res and res:failure() and not using_force and updates_rejected and config.values.prompt_force_push then
     logger.error("Attempting force push to " .. name)
 
-    local message = "Your branch has diverged from the remote branch. Do you want to force push?"
+    local message = "Your branch has diverged from the remote branch. Do you want to force push with lease?"
     if input.get_permission(message) then
-      table.insert(args, "--force")
+      table.insert(args, "--force-with-lease")
       res = git.push.push_interactive(remote, branch, args)
     end
   end