go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-17 00:18:05 +02:00
Code Issues Releases Activity
6,509 Commits 46 Branches 225 Tags
cc822bccd50aa33c608f68cbaf6c2a8b4b4deef1
Commit Graph

3 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
696e78fcc8 Fix ForEachLineInFile to not lose the last line if it doesn't end with a LF 2024-10-09 15:37:08 +02:00
Stefan Haller
b71aa5e23b Add regression test for resolving conflicts in a file without a trailing LF 
The test shows that the last line of the file is lost.
 2024-10-09 15:36:02 +02:00