Logo
Explore Help
Sign In
DEV/jesseduffield_lazygit
1
0
Fork 0
You've already forked jesseduffield_lazygit
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-02-20 01:02:29 +08:00
Code Issues Packages Projects Releases Wiki Activity
jesseduffield_lazygit/pkg/integration/tests/conflicts
History
Stefan Haller 362678e2ef Mention which command is continued in PromptToContinueRebase
When you are in the middle of a rebase, and you cherry-pick a commit which
conflicts, it helps to be clear on whether you are prompted to continue the
cherry-pick or the rebase.
2025-04-20 15:53:17 +02:00
..
filter.go
Add a root item ("/") if files at top level have changed
2025-03-21 08:04:58 +01:00
resolve_externally.go
Mention which command is continued in PromptToContinueRebase
2025-04-20 15:53:17 +02:00
resolve_multiple_files.go
Mention which command is continued in PromptToContinueRebase
2025-04-20 15:53:17 +02:00
resolve_no_auto_stage.go
Add a root item ("/") if files at top level have changed
2025-03-21 08:04:58 +01:00
resolve_non_textual_conflicts.go
Provide conflict resolution dialogs for non-textual conflicts
2025-04-09 10:27:57 +02:00
resolve_without_trailing_lf.go
Mention which command is continued in PromptToContinueRebase
2025-04-20 15:53:17 +02:00
undo_choose_hunk.go
Construct arg vector manually rather than parse string
2023-05-23 19:49:19 +10:00
Powered by Gitea Version: 1.23.1 Page: 870ms Template: 86ms
English
Bahasa Indonesia Deutsch English Español Français Gaeilge Italiano Latviešu Magyar nyelv Nederlands Polski Português de Portugal Português do Brasil Suomi Svenska Türkçe Čeština Ελληνικά Български Русский Українська فارسی മലയാളം 日本語 简体中文 繁體中文(台灣) 繁體中文(香港) 한국어
Licenses API