Stefan Haller 33e5f8f776

Merge pull request #2694 from stefanhaller/conflict-handling-menu ...

Show menu instead of prompt when there are conflicts in a rebase or merge

2023-06-01 10:52:11 +02:00

..

app

Allow global logging when developing

2023-05-25 18:31:32 +10:00

cheatsheet

Use sentence case everywhere

2023-05-25 23:52:19 +10:00

commands

Add --all to "git fetch" command when not fetching a specific remote

2023-06-01 10:13:14 +02:00

common

…

config

Add --all to "git fetch" command when not fetching a specific remote

2023-06-01 10:13:14 +02:00

constants

…

env

clearer separation of concerns when bootstrapping application

2022-05-07 16:02:04 +10:00

fakes

cleanup integration test code

2023-02-26 12:54:13 +11:00

gui

Show menu instead of prompt when there are conflicts in a rebase or merge

2023-06-01 10:51:48 +02:00

i18n

Show menu instead of prompt when there are conflicts in a rebase or merge

2023-06-01 10:51:48 +02:00

integration

Show menu instead of prompt when there are conflicts in a rebase or merge

2023-06-01 10:51:48 +02:00

logs

Allow global logging when developing

2023-05-25 18:31:32 +10:00

secureexec

Cache binary paths

2023-05-23 19:15:33 +10:00

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

Support strikethrough text style

2023-05-21 10:46:13 +10:00

updates

Construct arg vector manually rather than parse string

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

utils

More compact and flexible date format

2023-05-26 17:31:39 +10:00