Stefan Haller 17bb3970c1 Filter out merge commits when generating todo changes in InteractiveRebase ... We will need this because under some conditions we are going to use this function to edit a range of commits, and we can't set merge commits to "edit". This corresponds to the code in startInteractiveRebaseWithEdit which has similar logic. It is a bit unfortunate that we will have these two different ways of setting todos to edit: startInteractiveRebaseWithEdit does it after stopping in the rebase, in the Then function of its refresh, but InteractiveRebase does it in the daemon with a ChangeTodoActionsInstruction. It still makes sense though, given how InteractiveRebase works. This not only affects "edit", but also "drop", "fixup", and "squash". Previously, when trying to use these for a range selection that includes a merge commit, they would fail with the cryptic error message "Some todos not found in git-rebase-todo"; now they simply exclude the merge commit. I'm not sure if one is better or worse than the other, and we should probably simply disable the commands when a merge commit is selected, but that's out of scope in this PR.		2024-12-01 11:05:45 +01:00
..
app	Add changeToFixup field to MoveFixupCommitDown	2024-09-15 11:19:39 +02:00
cheatsheet	Initialize translation set after reading user config	2024-08-18 10:24:52 +02:00
commands	Filter out merge commits when generating todo changes in InteractiveRebase	2024-12-01 11:05:45 +01:00
common	Make common.UserConfig an atomic.Pointer for safe concurrent access	2024-08-18 10:24:52 +02:00
config	use an unsigned_64 for DiffContextSize and add saturated add/subtract	2024-11-19 08:21:19 +11:00
constants	Make the links in the status panel point to the current version rather than master	2024-03-22 08:13:59 +01:00
env	Support bare worktrees where worktree does not have its own .git file	2023-08-07 22:40:53 +10:00
fakes	cleanup integration test code	2023-02-26 12:54:13 +11:00
gui	Allow deleting a range selection of branches	2024-12-01 10:59:54 +01:00
i18n	Allow deleting a range selection of branches	2024-12-01 10:59:54 +01:00
integration	Add test for editing several commits right after a merge commit	2024-12-01 11:05:45 +01:00
jsonschema	Let schema/config.json end with a line feed	2024-11-30 15:03:29 +01:00
logs	Remove secureexec package	2023-07-30 19:59:51 +10:00
snake	integrate snake game into lazygit	2022-12-30 12:18:59 +11:00
tasks	Use ScanLinesAndTruncateWhenLongerThanBuffer instead of bufio.ScanLines	2024-05-15 13:27:01 +02:00
theme	Highlight inactive selection in bold	2024-06-23 14:43:13 +02:00
updates	Change direct access to Common.UserConfig to a getter	2024-08-18 10:24:52 +02:00
utils	Fix ForEachLineInFile to not lose the last line if it doesn't end with a LF	2024-10-09 15:37:08 +02:00