1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2024-12-12 11:15:00 +02:00
lazygit/pkg/commands/git_commands
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
..
bisect_info.go simplify 2022-03-24 20:14:41 +11:00
bisect.go Add convenience builder for git commands 2023-05-20 20:54:24 +10:00
branch_loader_test.go Merge loaders package into git_commands package 2022-11-14 18:11:45 +11:00
branch_loader.go fix: fix ambiguous branch name 2022-11-14 19:05:07 +11:00
branch_test.go Increase test coverage 2023-05-20 16:55:15 +10:00
branch.go Add convenience builder for git commands 2023-05-20 20:54:24 +10:00
commit_file_loader_test.go Merge loaders package into git_commands package 2022-11-14 18:11:45 +11:00
commit_file_loader.go Add convenience builder for git commands 2023-05-20 20:54:24 +10:00
commit_loader_test.go Add config git.mainBranches 2023-05-16 13:20:03 +02:00
commit_loader.go Add convenience builder for git commands 2023-05-20 20:54:24 +10:00
commit_test.go Split commit message panel into commit summary and commit description panel 2023-04-30 12:17:34 +10:00
commit.go Add convenience builder for git commands 2023-05-20 20:54:24 +10:00
common.go feat: add GitVersion struct 2022-12-30 20:01:14 +09:00
config.go restore field 2022-01-09 14:09:53 +11:00
custom.go refactor to group up more commonly used git command stuff 2022-01-18 22:01:09 +11:00
deps_test.go Refactor interface for ApplyPatch 2023-05-20 20:54:39 +10:00
file_loader_test.go Merge loaders package into git_commands package 2022-11-14 18:11:45 +11:00
file_loader.go Add convenience builder for git commands 2023-05-20 20:54:24 +10:00
file_test.go Implement edit presets 2023-04-13 13:14:00 +02:00
file.go Add support for falling back to legacy edit config 2023-04-13 13:14:00 +02:00
flow_test.go Increase test coverage 2023-05-20 16:55:15 +10:00
flow.go Add convenience builder for git commands 2023-05-20 20:54:24 +10:00
git_command_builder_test.go Add convenience builder for git commands 2023-05-20 20:54:24 +10:00
git_command_builder.go Add convenience builder for git commands 2023-05-20 20:54:24 +10:00
patch_test.go Refactor interface for ApplyPatch 2023-05-20 20:54:39 +10:00
patch.go Don't keep commits that become empty during a rebase 2023-05-20 21:10:03 +02:00
rebase_test.go Don't keep commits that become empty during a rebase 2023-05-20 21:10:03 +02:00
rebase.go Don't keep commits that become empty during a rebase 2023-05-20 21:10:03 +02:00
reflog_commit_loader_test.go Store commit.Status as an enum instead of a string 2023-04-15 08:36:03 +02:00
reflog_commit_loader.go Store commit.Status as an enum instead of a string 2023-04-15 08:36:03 +02:00
remote_loader.go Add convenience builder for git commands 2023-05-20 20:54:24 +10:00
remote.go Add convenience builder for git commands 2023-05-20 20:54:24 +10:00
stash_loader_test.go Merge loaders package into git_commands package 2022-11-14 18:11:45 +11:00
stash_loader.go Add convenience builder for git commands 2023-05-20 20:54:24 +10:00
stash_test.go Support ignoring whitespace on stash 2023-05-19 17:49:22 +02:00
stash.go Add convenience builder for git commands 2023-05-20 20:54:24 +10:00
status.go Add convenience builder for git commands 2023-05-20 20:54:24 +10:00
submodule.go Add convenience builder for git commands 2023-05-20 20:54:24 +10:00
sync_test.go Revert "feat: support for push --force-if-includes" 2023-04-17 19:37:33 +09:00
sync.go Add convenience builder for git commands 2023-05-20 20:54:24 +10:00
tag_loader_test.go show tag message 2023-02-20 19:01:08 +11:00
tag_loader.go Add convenience builder for git commands 2023-05-20 20:54:24 +10:00
tag.go Add convenience builder for git commands 2023-05-20 20:54:24 +10:00
version_test.go feat: add GitVersion struct 2022-12-30 20:01:14 +09:00
version.go Add convenience builder for git commands 2023-05-20 20:54:24 +10:00
working_tree_test.go Refactor interface for ApplyPatch 2023-05-20 20:54:39 +10:00
working_tree.go Refactor interface for ApplyPatch 2023-05-20 20:54:39 +10:00