utils-code/jesseduffield.lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-09-10 15:46:26 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
jesseduffield.lazygit/pkg/integration/tests/cherry_pick
History
Stefan Haller 1c17ee1a92 Auto-select the conflicted commit when stopping in rebase 
When a rebase (or multi-commit cherry-pick or revert) stops with a
conflict, it is often useful to look at the diff of the "<-- CONFLICT"
commit to double-check that the conflict resolution matches the diff of
the original commit. To make that easier, select that commit
automatically.
2026-08-15 15:24:36 +02:00
..
cherry_pick.go Move LocalBranchSortOrder and RemoteBranchSortOrder to user config 2025-07-09 13:15:03 +02:00
cherry_pick_commit_that_becomes_empty.go Keep selected commits stable across refreshes 2026-06-23 09:20:05 +02:00
cherry_pick_conflicts.go Auto-select the conflicted commit when stopping in rebase 2026-08-15 15:24:36 +02:00
cherry_pick_conflicts_empty_commit_after_resolving.go Keep selected commits stable across refreshes 2026-06-23 09:20:05 +02:00
cherry_pick_during_rebase.go Change list section headers to a slightly more elegant design 2026-07-31 08:03:40 +02:00
cherry_pick_merge.go Use more widely-supported Unicode symbols for the commit graph 2026-05-04 13:06:29 +02:00
cherry_pick_range.go Move LocalBranchSortOrder and RemoteBranchSortOrder to user config 2025-07-09 13:15:03 +02:00
cherry_pick_range_after_paste.go Clear cherry-pick buffer when copying after a paste 2026-05-09 14:02:42 +02:00