Stefan Haller 078445db63 Allow deleting a merge commit ... For non-merge commits we change "pick" to "drop" when we delete them. We do this so that we can use the same code for dropping a commit no matter whether we are in an interactive rebase or not. (If we aren't, we could just as well delete the pick line from the todo list instead of setting it to "drop", but if we are, it is better to keep the line around so that the user can change it back to "pick" if they change their mind.) However, merge commits can't be changed to "drop", so we have to delete them from the todo file. We add a new daemon instruction that does this. We still don't allow deleting a merge commit from within an interactive rebase. The reason is that we don't show the "label" and "reset" todos in lazygit, so deleting a merge commit would leave the commits from the branch that is being merged in the list as "pick" commits, with no indication that they are going to be dropped because they are on a different branch, and the merge commit that would have brought them in is gone. This could be very confusing.		2024-12-23 12:12:45 +01:00
..
daemon	Allow deleting a merge commit	2024-12-23 12:12:45 +01:00
types	move code from main into app package to allow test to be injected	2022-08-13 13:55:08 +10:00
app.go	Initialize translation set after reading user config	2024-08-18 10:24:52 +02:00
entry_point.go	Save changed user config back to disk in integration tests	2024-08-18 10:24:52 +02:00
errors.go	Show a friendly error message when starting lazygit from a non-existent cwd	2024-01-02 18:25:28 +00:00