1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-01-10 04:07:18 +02:00
lazygit/pkg
Stefan Haller 3cddd7cfa5 Don't keep commits that become empty during a rebase
The only exception is when moving a custom patch for an entire commit to an
earlier commit; in this case the source commit becomes empty, but we want to
keep it, mainly for consistency with moving the patch to a later commit, which
behaves the same.

In all other cases where we rebase, it's confusing when empty commits are kept;
the most common example is rebasing a branch onto master, where master already
contains some of the commits of our branch. In this case we simply want to drop
these.
2023-05-20 21:10:03 +02:00
..
app merge master into refactor-better-encapsulation 2023-05-02 19:05:42 +10:00
cheatsheet Split commit message panel into commit summary and commit description panel 2023-04-30 13:19:53 +10:00
commands Don't keep commits that become empty during a rebase 2023-05-20 21:10:03 +02:00
common
config Add config git.mainBranches 2023-05-16 13:20:03 +02:00
constants
env
fakes cleanup integration test code 2023-02-26 12:54:13 +11:00
gui Show correct keybinding in tip 2023-05-20 23:36:34 +10:00
i18n Remove the toast when toggling "ignore whitespace" 2023-05-20 12:58:32 +10:00
integration Remove the toast when toggling "ignore whitespace" 2023-05-20 12:58:32 +10:00
logs
secureexec
snake integrate snake game into lazygit 2022-12-30 12:18:59 +11:00
tasks prevent unnecessary re-renders of view 2023-04-02 15:44:05 +10:00
theme Fix setting gui.selectedRangeBgColor as a hex value 2023-03-03 08:46:43 +01:00
updates Begin refactoring gui 2023-04-30 13:19:52 +10:00
utils add ability to update yaml path while preserving comments 2023-05-10 22:31:27 +10:00