Jesse Duffield
84a1992055
better locking of merge panel state
2022-01-27 21:25:04 +11:00
Jesse Duffield
fa2e7ae1e7
show only merge conflict files when there are merge conflicts
2022-01-26 20:28:32 +11:00
Jesse Duffield
c8cc18920f
improve merge conflict flow
2022-01-26 14:50:47 +11:00
Jesse Duffield
5b7dd9e43c
properly resolve cyclic dependency
2022-01-22 10:48:51 +11:00
Jesse Duffield
1c84f77319
always specify upstream when pushing/pulling
2022-01-15 15:34:01 +11:00
Jesse Duffield
8d8bdb948b
avoid deadlock in merge panel
2022-01-15 14:15:41 +11:00
Jesse Duffield
cdcfeb396f
stop refreshing the screen so much
2022-01-15 14:15:41 +11:00
Jesse Duffield
364c5db19c
shorten name
2022-01-09 14:09:53 +11:00
Jesse Duffield
c9a0cc6b30
refactor
2022-01-09 14:09:53 +11:00
Jesse Duffield
e92076d2c2
start removing direct calls to cmd.New from gui
2022-01-09 14:09:53 +11:00
Jesse Duffield
3f44eac95b
remove repo field
2022-01-09 14:09:53 +11:00
Jesse Duffield
f503ff1ecb
start breaking up git struct
2022-01-09 14:09:53 +11:00
Jakob Kogler
68fc6059d3
rename variable to failedCommitMessage
2022-01-07 11:01:42 +11:00
Jakob Kogler
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
Jesse Duffield
91fe68576c
refactor
2022-01-07 10:52:51 +11:00
Jesse Duffield
05fa483f48
simplify how we log commands
2022-01-07 10:52:51 +11:00
Jesse Duffield
9c4a819683
refactor sync test
2022-01-04 09:07:15 +11:00
Jesse Duffield
9b2b0fc122
WIP
2022-01-04 09:07:15 +11:00
Jesse Duffield
43a4fa970d
WIP
2022-01-04 09:07:15 +11:00
Jesse Duffield
01ea5813a8
align Gui struct with GitCommand
2022-01-04 09:07:15 +11:00
Jesse Duffield
b4c078d565
WIP
2022-01-04 09:07:15 +11:00
Marius Bergmann
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
Mark Sagi-Kazar
fdf0d4a2c3
implement signoff
...
Signed-off-by: Mark Sagi-Kazar <mark.sagikazar@gmail.com>
2021-12-25 12:01:55 +11:00
Jesse Duffield
1996eddd91
more efficient context diff size changing
2021-12-06 22:37:28 +11:00
Jesse Duffield
2fc1498517
some refactoring in anticipation of the graph feature
2021-11-01 10:03:49 +11:00
Jesse Duffield
01d82749b1
fix commit message prefix thingo
2021-10-25 22:40:15 +00:00
Jesse Duffield
ef544e6ce9
add more suggestions
2021-10-23 12:29:52 +11:00
Jesse Duffield
6388af70ac
simplify pull logic
2021-10-22 21:33:17 +11:00
Jesse Duffield
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
Jesse Duffield
d672b7342f
stop resetting scroll all the time
2021-10-17 19:45:57 +11:00
Jesse Duffield
345c90ac05
fix editor
2021-10-17 04:17:59 +00:00
Liberatys
711bd5a670
Lint
2021-08-25 20:13:50 +10:00
Liberatys
6b68f4f25d
Update as per review and add tests
2021-08-25 20:13:50 +10:00
Liberatys
89ee0a1dee
Move field names to translation
2021-08-25 20:13:50 +10:00
Liberatys
2dc6f5f079
Implement state filtering for commit files
2021-08-25 20:13:50 +10:00
Ryooooooga
4f66093335
introduce edit command template to open a specifig line of a file
2021-08-03 21:42:14 +09:00
Davyd McColl
a9f04d3925
✨ facilitate toggling whitespace in the diff view with a hotkey (c-w by default)
2021-07-01 17:13:13 +10:00
Emiliano Ruiz Carletti
b4e6850f98
Fix wrong ff-only configuration
2021-06-15 08:31:07 +10:00
Emiliano Ruiz Carletti
c57a0077d0
Read pull mode from gitconfig lazily
2021-06-15 08:31:07 +10:00
Jesse Duffield
9fdf92b226
more refactoring
...
WIP
WIP
2021-06-06 09:12:49 +10:00
Jesse Duffield
b28b2d05bd
force cursor to be at end of line when opening confirmation panel
2021-04-17 21:15:54 +10:00
Jesse Duffield
adee0b8ccb
add spans to i18n
2021-04-11 23:36:34 +10:00
Jesse Duffield
6fbe660f96
full coverage for logging commands
2021-04-11 17:07:49 +10:00
Jesse Duffield
bb918b579a
start adding support for logging of commands
2021-04-11 17:07:49 +10:00
Jesse Duffield
9f4433d8b5
allow opening merge tool
2021-04-11 10:21:53 +10:00
Jesse Duffield
e42e7e5cbd
fix commit amend
2021-04-10 11:54:38 +10:00
Jesse Duffield
d5504fa5d0
potentially fix credentials issue
2021-04-09 00:39:04 +10:00
Jesse Duffield
b1cda65dcf
show error when user attempts to commit when no files are present
2021-04-06 19:34:32 +10:00
Jesse Duffield
d627b3bfc8
more refactoring
2021-04-06 19:34:32 +10:00
Jesse Duffield
39ae122304
more refactoring
2021-04-06 19:34:32 +10:00
