1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2024-12-12 11:15:00 +02:00
lazygit/pkg/gui
Stefan Haller 3fe4db9316 Make RebaseCommands.AmendTo more robust
This fixes two problems with the "amend commit with staged changes" command:

1. Amending to a fixup commit didn't work (this would create a commmit with the
   title "fixup! fixup! original title" and keep that at the top of the branch)
2. Unrelated fixup commits would be squashed too.

The added integration test verifies that both of these problems are fixed.
2023-04-29 07:28:33 +02:00
..
context feat(subcommits): load unlimited sub-commits 2023-02-27 15:29:00 +09:00
controllers Make RebaseCommands.AmendTo more robust 2023-04-29 07:28:33 +02:00
filetree fix could-not-access error 2022-11-12 18:09:15 -03:30
keybindings Make arrows consistent (#2501) 2023-03-18 11:32:44 +11:00
mergeconflicts migrate patch building tests 2023-02-25 21:37:16 +11:00
modes
patch_exploring refactor patch code 2023-03-19 16:30:39 +11:00
popup fix: fix goroutine leaks 2023-01-06 10:51:09 +09:00
presentation Show update-ref commands in rebase todo list 2023-04-15 08:36:03 +02:00
services/custom_commands Resolve the prompt just before using it 2022-11-25 22:46:36 +01:00
style fix: fix default color to be white 2023-02-03 23:36:59 +09:00
types Merge pull request #2433 from Ryooooooga/subcommits-limit 2023-03-06 18:22:57 +11:00
app_status_manager.go [#2258] show bottom line when having status 2022-11-14 00:53:55 +03:00
arrangement.go [#2258] hide options panel when showBottom line is disabled 2022-11-14 01:04:56 +03:00
background.go move background code into its own file 2022-12-24 19:14:52 +11:00
branches_panel.go
command_log_panel.go Fix deprecated rand.Seed 2023-03-19 10:00:19 +01:00
commit_files_panel.go Allow ignoring whitespace in diff in commits panel 2023-02-07 12:14:29 +01:00
commit_message_panel.go
commits_panel.go Show update-ref commands in rebase todo list 2023-04-15 08:36:03 +02:00
confirmation_panel.go Remove alternative confirmation and return keymappings 2023-03-09 10:32:00 +01:00
context_config.go rename patch manager to patch builder 2023-03-19 16:35:57 +11:00
context.go Merge pull request #2377 from shinhs0506/clear-staging-after-commit 2023-03-24 19:13:00 +11:00
controllers.go Extract amendHead function into new AmendHelper 2023-04-01 08:16:15 +02:00
custom_patch_options_panel.go rename patch manager to patch builder 2023-03-19 16:35:57 +11:00
diff_context_size_test.go
diffing.go Allow ignoring whitespace in diff in commits panel 2023-02-07 12:14:29 +01:00
dummies.go feat: add GitVersion struct 2022-12-30 20:01:14 +09:00
editors.go feat(editors.go): move by words 2022-10-05 22:29:55 +09:00
extras_panel.go
file_watching.go
files_panel.go fix: fix initial origin of commit message panel 2022-10-15 20:09:23 +09:00
filtering_menu_panel.go
filtering.go
global_handlers.go
gui_common.go
gui_driver.go Improve staging panel integration tests 2023-02-25 11:35:41 +11:00
gui.go Show warning about deprecated edit configs 2023-04-13 13:14:00 +02:00
information_panel.go
keybindings.go Remove alternative confirmation and return keymappings 2023-03-09 10:32:00 +01:00
layout.go chore: remove UNKNOWN_VIEW_ERROR_MSG 2023-02-10 21:26:51 +09:00
list_context_config.go rename patch manager to patch builder 2023-03-19 16:35:57 +11:00
main_panels.go fix glitchy render of stale data when flicking through files and directories 2022-10-02 20:41:24 -07:00
menu_panel.go
modes.go rename patch manager to patch builder 2023-03-19 16:35:57 +11:00
options_menu_panel.go fix: disable menu key binding while displaying popup 2023-02-09 20:13:41 +09:00
pty_windows.go
pty.go Make sure scrollbars have the right size initially 2023-03-21 18:26:18 +01:00
quitting.go
recent_repos_panel.go appease golangci-lint (#2512) 2023-03-19 11:20:29 +11:00
reflog_panel.go Allow ignoring whitespace in diff in commits panel 2023-02-07 12:14:29 +01:00
refresh.go rename patch manager to patch builder 2023-03-19 16:35:57 +11:00
remote_branches_panel.go
remotes_panel.go
searching.go
side_window.go
snake.go integrate snake game into lazygit 2022-12-30 12:18:59 +11:00
stash_panel.go
status_panel.go
sub_commits_panel.go feat(subcommits): load unlimited sub-commits 2023-02-27 15:29:00 +09:00
submodules_panel.go
suggestions_panel.go
tags_panel.go
tasks_adapter.go Make sure scrollbars have the right size initially 2023-03-21 18:26:18 +01:00
test_mode.go remove old integration test recording code 2023-03-24 18:42:11 +11:00
updates.go
view_helpers.go Make sure scrollbars have the right size initially 2023-03-21 18:26:18 +01:00
views.go fix reflog text colour by defaulting every view to the same foreground colour 2023-03-26 15:24:09 +11:00
whitespace-toggle.go Better redrawing after toggling "ignore whitespace" 2023-02-07 12:09:17 +01:00
window.go appease linter 2022-12-30 12:18:59 +11:00