Stefan Haller 050225ffe6 Show per-side commit logs for submodule conflicts in the main view ... When a conflicted submodule is selected, the main view shows the commits each side added relative to their common ancestor as two indented logs, labelled current and incoming, so it's clear which commit each side would resolve to. The logs aren't truncated (the view scrolls). If a side added no commits of its own (e.g. it was rewound to an ancestor of the other), its head commit is shown instead. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>		2026-06-28 16:12:36 +02:00
..
add.go	Add a root item ("/") if files at top level have changed	2025-03-21 08:04:58 +01:00
enter.go	Convert custom command Key fields to Keybinding	2026-05-25 15:32:47 +02:00
enter_nested.go	Remove conditional code related to git earlier than 2.22	2025-04-09 10:40:52 +02:00
remove.go	Add integration test	2025-04-07 09:42:19 +02:00
remove_nested.go	Make file sort order and case sensitivity configurable	2026-03-30 17:53:25 +02:00
reset.go	Convert custom command Key fields to Keybinding	2026-05-25 15:32:47 +02:00
reset_folder.go	Update disabled message	2025-04-07 09:42:19 +02:00
resolve_conflict.go	Show per-side commit logs for submodule conflicts in the main view	2026-06-28 16:12:36 +02:00
resolve_conflict_rewound_side.go	Show per-side commit logs for submodule conflicts in the main view	2026-06-28 16:12:36 +02:00
shared.go	Show all submodules recursively	2024-03-07 20:16:28 +01:00
stage.go	Also verify stage-all can unstage a dirty submodule	2026-06-04 09:12:09 +02:00
stage_all_with_dirty_submodule.go	Explain when a submodule has nothing stageable	2026-06-04 09:12:09 +02:00
stage_dirty_only.go	Explain when a submodule has nothing stageable	2026-06-04 09:12:09 +02:00