4 Commits

Author	SHA1	Message	Date
Stefan Haller	362678e2ef	Mention which command is continued in PromptToContinueRebase ... When you are in the middle of a rebase, and you cherry-pick a commit which conflicts, it helps to be clear on whether you are prompted to continue the cherry-pick or the rebase.	2025-04-20 15:53:17 +02:00
Stefan Haller	ba21d4e651	Ask to auto-stage unstaged files when continuing a rebase after resolving conflicts	2024-09-02 18:24:36 +02:00
Jesse Duffield	269ef7f250	Support range select for staging/discarding files ... As part of this, you must now press enter on a merge conflict file to focus the merge view; you can no longer press space and if you do it will raise an error.	2024-01-25 11:34:59 +11:00
Jesse Duffield	fd861826bc	Add integration tests for discarding files	2023-07-03 12:54:13 +10:00