mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-11-21 04:46:29 +03:00
Discarding a file or directory in the files panel runs git commands on these paths only, and these leave SQUASH_MSG alone. If users discard all changes of a squash merge this way, lazygit keeps showing a merge in progress, and the next commit gets the squash merge message. Abort the squash merge after "Discard all changes" if no changes are left. Untracked files don't count, because a squash merge stages the files that it adds. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>