1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-15 00:15:32 +02:00
Commit Graph

303 Commits

Author SHA1 Message Date
0c3eab4059 fix: fix initial origin of commit message panel 2022-10-15 20:09:23 +09:00
d73a236d7c allow rendering to main panels from anywhere 2022-08-07 12:05:51 +10:00
7410acd1aa move merge conflicts code into controller 2022-08-07 11:16:03 +10:00
445a625b56 rename merging context to mergeConflicts 2022-08-06 18:05:00 +10:00
524bf83a4a refactor to only have one context per view 2022-08-06 13:49:11 +10:00
d72ffdc4a7 refactor 2022-05-15 19:10:04 +10:00
1ef585969f add option to always show unstaged/staged panels 2022-05-08 17:24:55 +09:00
d93fef4c61 use generics to DRY up context code 2022-03-19 12:12:57 +11:00
145c69d9ae working again 2022-03-17 19:13:40 +11:00
0a8cff6ab6 some more refactoring 2022-03-17 19:13:40 +11:00
8ea7b7a62e migrate files context to new structure 2022-03-17 19:13:40 +11:00
51547e3822 move all refresh code into the one file 2022-03-17 19:13:40 +11:00
e363606fb6 move context keys into context package 2022-03-17 19:13:40 +11:00
138be04e65 refactor contexts code 2022-03-17 19:13:40 +11:00
a2318d75b5 fix some things 2022-03-17 19:13:40 +11:00
1dd7307fde start moving commit panel handlers into controller
more

and more

move rebase commit refreshing into existing abstraction

and more

and more

WIP

and more

handling clicks

properly fix merge conflicts

update cheatsheet

lots more preparation to start moving things into controllers

WIP

better typing

expand on remotes controller

moving more code into controllers
2022-03-17 19:13:40 +11:00
a90b6efded start refactoring gui 2022-03-17 19:13:40 +11:00
84a1992055 better locking of merge panel state 2022-01-27 21:25:04 +11:00
fa2e7ae1e7 show only merge conflict files when there are merge conflicts 2022-01-26 20:28:32 +11:00
c8cc18920f improve merge conflict flow 2022-01-26 14:50:47 +11:00
5b7dd9e43c properly resolve cyclic dependency 2022-01-22 10:48:51 +11:00
1c84f77319 always specify upstream when pushing/pulling 2022-01-15 15:34:01 +11:00
8d8bdb948b avoid deadlock in merge panel 2022-01-15 14:15:41 +11:00
cdcfeb396f stop refreshing the screen so much 2022-01-15 14:15:41 +11:00
364c5db19c shorten name 2022-01-09 14:09:53 +11:00
c9a0cc6b30 refactor 2022-01-09 14:09:53 +11:00
e92076d2c2 start removing direct calls to cmd.New from gui 2022-01-09 14:09:53 +11:00
3f44eac95b remove repo field 2022-01-09 14:09:53 +11:00
f503ff1ecb start breaking up git struct 2022-01-09 14:09:53 +11:00
68fc6059d3 rename variable to failedCommitMessage 2022-01-07 11:01:42 +11:00
beedc2553d remember the message if commit fails
In case a commit fails, e.g. because a pre-commit hook returns an error,
lazygit will now remember the commit message and will suggest it during
the next commit (e.g. after fixing the error of the pre-commit hook).
2022-01-07 11:01:42 +11:00
91fe68576c refactor 2022-01-07 10:52:51 +11:00
05fa483f48 simplify how we log commands 2022-01-07 10:52:51 +11:00
9c4a819683 refactor sync test 2022-01-04 09:07:15 +11:00
9b2b0fc122 WIP 2022-01-04 09:07:15 +11:00
43a4fa970d WIP 2022-01-04 09:07:15 +11:00
01ea5813a8 align Gui struct with GitCommand 2022-01-04 09:07:15 +11:00
b4c078d565 WIP 2022-01-04 09:07:15 +11:00
38743ec99f Suggest existing remote for non-tracking branch
Currently, when pushing or pulling a branch that has no tracking remote,
lazygit suggests the (hard-coded) remote named 'origin'. However, a
repository might not have a remote with this name, in which case the
suggestion makes no sense. This happens to me quite regularly when I
choose a more meaningful name than 'origin' for a remote.

This change keeps the current behavior by suggesting 'origin' when there
is either a remote with that name or no remote at all. However, when
'origin' does not exist, the name of the first remote is suggested.

Suggest existing remote for non-tracking branch

Currently, when pushing or pulling a branch that has no tracking remote,
lazygit suggests the (hard-coded) remote named 'origin'. However, a
repository might not have a remote with this name, in which case the
suggestion makes no sense. This happens to me quite regularly when I
choose a more meaningful name than 'origin' for a remote.

This change keeps the current behavior by suggesting 'origin' when there
is either a remote with that name or no remote at all. However, when
'origin' does not exist, the name of the first existing remote is
suggested.
2021-12-26 15:47:58 +11:00
fdf0d4a2c3 implement signoff
Signed-off-by: Mark Sagi-Kazar <mark.sagikazar@gmail.com>
2021-12-25 12:01:55 +11:00
1996eddd91 more efficient context diff size changing 2021-12-06 22:37:28 +11:00
2fc1498517 some refactoring in anticipation of the graph feature 2021-11-01 10:03:49 +11:00
01d82749b1 fix commit message prefix thingo 2021-10-25 22:40:15 +00:00
ef544e6ce9 add more suggestions 2021-10-23 12:29:52 +11:00
6388af70ac simplify pull logic 2021-10-22 21:33:17 +11:00
5ee559b896 fix issue where upstream origin and branch were quoted together
fix issue where upstream origin and branch were quoted together
2021-10-20 09:29:17 +11:00
d672b7342f stop resetting scroll all the time 2021-10-17 19:45:57 +11:00
345c90ac05 fix editor 2021-10-17 04:17:59 +00:00
711bd5a670 Lint 2021-08-25 20:13:50 +10:00
6b68f4f25d Update as per review and add tests 2021-08-25 20:13:50 +10:00