Skip to content

Use --force-with-lease in push popup #1807

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 26, 2025
Merged

Use --force-with-lease in push popup #1807

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lua/neogit/popups/push/actions.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down