Files
lazygit/pkg/integration/tests/file
Stefan HallerandClaude Opus 5.5 8683f60761 End a squash merge when the user discards all of its changes
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>
2026-11-08 15:36:41 +01:00
..
2026-01-28 21:10:29 +01:00
2025-04-02 18:15:44 +02:00