ComputerSurge/lazygit
3
0
Fork 0
Code Pull Requests 1 Activity
2,663 Commits 45 Branches 220 Tags
44d08edfb02686c3dd22429356a9e4b327191f91
Commit Graph
1174 Commits
Author SHA1 Message Date
Jesse Duffield 44d08edfb0 Address feedback 2021-08-25 22:23:55 +10:00
Jesse Duffield f08fdb2873 Minor refactor 2021-08-25 22:23:55 +10:00
RyoooooogaandJesse Duffield df4eb70ba2 Fix translations 2021-08-25 22:23:55 +10:00
RyoooooogaandJesse Duffield 6ca42ff720 Fix pick all hunks 2021-08-25 22:23:55 +10:00
RyoooooogaandJesse Duffield a533f8e1a5 simplify merge panel logic 2021-08-25 22:23:55 +10:00
RyoooooogaandJesse Duffield cf8ded0b79 add mergeConflict#hasAncestor 2021-08-25 22:23:55 +10:00
RyoooooogaandJesse Duffield 73548fa15f Fix conflict resolution 2021-08-25 22:23:55 +10:00
RyoooooogaandJesse Duffield a0e7604f61 Support git config merge.conflictStyle diff3 2021-08-25 22:23:55 +10:00
LiberatysandJesse Duffield 711bd5a670 Lint 2021-08-25 20:13:50 +10:00
LiberatysandJesse Duffield 6b68f4f25d Update as per review and add tests 2021-08-25 20:13:50 +10:00
LiberatysandJesse Duffield 89ee0a1dee Move field names to translation 2021-08-25 20:13:50 +10:00
LiberatysandJesse Duffield 2dc6f5f079 Implement state filtering for commit files 2021-08-25 20:13:50 +10:00
Mark KopengaandGitHub 487ad196a7 Merge pull request #1413 from Ryooooooga/feature/edit-line 
Make os.editCommand customizable using template
 2021-08-23 10:15:38 +02:00
Ryooooooga 0af0e66586 Fix panic in merge conflict 2021-08-21 18:34:30 +09:00
mjarkk e58376f9f7 add tests for TemplateFuncMapAddColors 2021-08-09 21:09:52 +02:00
Elwardi e8e4fa5957 Add color functions to templates funcMaps 2021-08-09 11:52:00 +01:00
Elwardi b5d8849c06 Support match colors in labelFormat entry in menuFromCommand prompts 2021-08-07 16:06:36 +01:00
Mark KopengaandGitHub 5d1a9639b6 Merge pull request #1416 from FoamScience/feature_menuOptions 2021-08-07 15:24:42 +02:00
mjarkk ea136e4e77 Improve code quality 
- Make CommandMenuEntry private
- create candidates only once we really need it
- Use only 1 buffer
- Clearify CommandMenuEntry creation fields
 2021-08-06 21:50:58 +02:00
Elwardi dcd3b7c058 Show only labels in menuFromCommand prompts 2021-08-06 18:38:26 +01:00
Elwardi 906ec30cac Minor changes to menuFromCommand prompts 2021-08-06 10:53:32 +01:00
Matthew Garelli 46c146a8c1 fixed test failing due to ForceSetColorLevel in pkg/gui/style/style_test.go 2021-08-06 02:18:04 -07:00
Elwardi a8ec044f0e Make menuFromCommand format menu items and their description 2021-08-05 15:45:18 +01:00
Ryooooooga ac609bd37c fix backward compatibility 2021-08-04 18:43:34 +09:00
Ryooooooga 67cc65930a fix out of range error 2021-08-03 22:00:28 +09:00
Ryooooooga 4f66093335 introduce edit command template to open a specifig line of a file 2021-08-03 21:42:14 +09:00
Jesse Duffield d626bcac00 color fixups 2021-08-01 16:14:56 +10:00
Jesse Duffield e798aa4b15 more color tests 2021-08-01 13:21:06 +10:00
mjarkk 0662733ad9 add tests for color changes 2021-07-31 20:53:49 +02:00
Jesse Duffield 550c0fd4dc refactor 2021-07-31 17:56:47 +10:00
Jesse Duffield 0bc0e4ac88 more efficient 2021-07-31 17:33:20 +10:00
Jesse Duffield 117c0bd4f7 simplify code a bit 2021-07-31 17:33:13 +10:00
mjarkk 79848087bc Switch to github.com/gookit/color for terminal colors 2021-07-30 15:14:46 +02:00
Jesse Duffield 62393cf28a more treeish files 2021-07-27 21:52:42 +10:00
Jesse Duffield b81bac3d65 more i18n 2021-07-27 21:30:08 +10:00
Jesse Duffield 58ddbae4d1 Minor refactor 2021-07-27 21:30:08 +10:00
Denis PalashevskiiandJesse Duffield 3802b563b0 Add error message if target branch not found with prompt 2021-07-27 21:30:08 +10:00
Denis PalashevskiiandJesse Duffield d1134daa53 review fixes: PR URL refactoring, target branch selection prompt 2021-07-27 21:30:08 +10:00
Denis PalashevskiiandJesse Duffield bccf203a18 Fix menu item color 2021-07-27 21:30:08 +10:00
Denis PalashevskiiandJesse Duffield b590397dce Update docs 2021-07-27 21:30:08 +10:00
Denis PalashevskiiandJesse Duffield 0e6598adbd Implement pull request options menu 2021-07-27 21:30:08 +10:00
Mark KopengaandGitHub eec20b845d Merge pull request #1392 from mjarkk/parcally-fix-1385 
Change the way file statuses are loaded
 2021-07-26 11:22:14 +02:00
mjarkk fc76b44b45 correctly show files with special chars in commit 2021-07-23 12:04:23 +02:00
mjarkk 9a087d04eb Change the way file statuses are loaded 
This makes it so file statuses recived from git no longer get joined
before spliting them again.
 2021-07-22 22:12:43 +02:00
mjarkk 713fae3e32 format code 2021-07-22 19:45:43 +02:00
Elwardi 148bf2c070 Add test for GenerateMenuCandidates from Custom Commands 2021-07-22 15:44:16 +01:00
Elwardi edfb0a26b2 Refactor code around handleCustomCommandKeybinding 2021-07-20 20:59:03 +01:00
Elwardi f70435a20f Better format error catching in menuFromCommand prompts 2021-07-19 13:41:42 +01:00
Elwardi b92ff3ee3f Consider first match only in menuFromCommand prompt 2021-07-19 13:06:00 +01:00
Elwardi f1ced5539a Add option to format filter matches to menuFromCommand prompts 2021-07-19 11:46:29 +01:00