Stefan Haller 3e5024480d Check for conflicts after reverting a commit ...

This way we get the usual menu for viewing the conflicts or aborting, like for
rebases.

2025-04-20 15:53:17 +02:00

..

bisect

Use getters for AppState and UserConfig instead of accessing the fields directly

2024-08-18 10:24:52 +02:00

branch

Mention which command is continued in PromptToContinueRebase

2025-04-20 15:53:17 +02:00

cherry_pick

Mention which command is continued in PromptToContinueRebase

2025-04-20 15:53:17 +02:00

commit

Check for conflicts after reverting a commit

2025-04-20 15:53:17 +02:00

config

Add an integration test for a config with a negative refspec

2025-03-11 08:33:41 +01:00

conflicts

Mention which command is continued in PromptToContinueRebase

2025-04-20 15:53:17 +02:00

custom_commands

Add runCommand function to Go template syntax

2025-04-09 10:44:36 +02:00

demo

Add number of commits to cherry-pick confirmation prompt

2025-01-08 21:08:42 -08:00

diff

Add "Absolute path" item to the file view's copy menu

2025-03-25 10:00:56 +01:00

file

Mention which command is continued in PromptToContinueRebase

2025-04-20 15:53:17 +02:00

filter_and_search

Add a root item ("/") if files at top level have changed

2025-03-21 08:04:58 +01:00

filter_by_author

Use getters for AppState and UserConfig instead of accessing the fields directly

2024-08-18 10:24:52 +02:00

filter_by_path

Add a root item ("/") if files at top level have changed

2025-03-21 08:04:58 +01:00

interactive_rebase

Mention which command is continued in PromptToContinueRebase

2025-04-20 15:53:17 +02:00

misc

Cleanup: simplify and tighten test expectations related to clipboard

2025-02-19 18:50:12 +01:00

patch_building

Mention which command is continued in PromptToContinueRebase

2025-04-20 15:53:17 +02:00

reflog

Add a root item ("/") if files at top level have changed

2025-03-21 08:04:58 +01:00

shared

Construct arg vector manually rather than parse string

2023-05-23 19:49:19 +10:00

shell_commands

Rename "Custom Command" to "Shell Command"

2024-08-17 10:56:03 +02:00

staging

Add a root item ("/") if files at top level have changed

2025-03-21 08:04:58 +01:00

stash

feat: Implement range stash drop

2025-04-02 17:34:35 +08:00

status

Use getters for AppState and UserConfig instead of accessing the fields directly

2024-08-18 10:24:52 +02:00

submodule

Remove conditional code related to git earlier than 2.22

2025-04-09 10:40:52 +02:00

sync

Mention which command is continued in PromptToContinueRebase

2025-04-20 15:53:17 +02:00

tag

Cleanup: simplify and tighten test expectations related to clipboard

2025-02-19 18:50:12 +01:00

ui

Disable global keybinds while popups are active

2025-02-23 08:44:48 +01:00

undo

Add a root item ("/") if files at top level have changed

2025-03-21 08:04:58 +01:00

worktree

Fix typos

2025-01-03 10:50:36 +11:00

test_list_generator.go

Fix typos

2025-01-03 10:50:36 +11:00

test_list.go

Add test for reverting a commit that conflicts

2025-04-20 15:53:17 +02:00

tests.go

Set working directory in lazygit test command

2024-01-12 19:59:31 +11:00