starred/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-08-28 10:15:32 -05:00
Code Issues Packages Projects Releases Wiki Activity
6,655 Commits 53 Branches 246 Tags
hack-log-command-pids
Commit Graph
4 Commits
Author SHA1 Message Date
Stefan Haller 6cbc1e0ace Add section headers for rebase todos, cherry-picks, reverts, and actual commits 2025-04-20 16:06:15 +02:00
Stefan Haller bb4d03db1f Show todos (and conflicting commit) for cherry-pick and revert 2025-04-20 15:55:44 +02:00
Stefan Haller 3e5024480d Check for conflicts after reverting a commit 
This way we get the usual menu for viewing the conflicts or aborting, like for
rebases.
 2025-04-20 15:53:17 +02:00
Stefan Haller 4b3262ab3e Add test for reverting a commit that conflicts 
This works already (except that the "you are here" marker is not right yet, but
that's an issue for another PR), just add a test that verifies it.
 2025-04-20 15:53:17 +02:00