ComputerSurge/lazygit
3
0
Fork 0
Code Pull Requests 1 Activity
1,343 Commits 45 Branches 220 Tags
db8c398fa33c6240bb4deca08aa6b5553497ef64
Commit Graph
691 Commits
Author SHA1 Message Date
Jesse Duffield db8c398fa3 strip whitespace when there is nothing else 2019-11-05 19:22:01 +11:00
Jesse Duffield 861bcc38be fix ambiguous condition 2019-11-05 19:22:01 +11:00
Jesse Duffield cd3874ffb7 don't let patch manager ever be nil 2019-11-05 19:22:01 +11:00
Jesse Duffield 10fe88a2cf more work on managing focus when applying patch command 2019-11-05 19:22:01 +11:00
Jesse Duffield 1a38bfb76d do not return focus to commitsFiles view after selecting to start a new patch 2019-11-05 19:22:01 +11:00
Jesse Duffield beaebb7dc7 handling when to show the split panel 2019-11-05 19:22:01 +11:00
Jesse Duffield 6d5d054c30 support line by line additions in staging and patch building contexts 2019-11-05 19:22:01 +11:00
Jesse Duffield 2344155379 handle empty commit in rebase 2019-11-05 19:22:01 +11:00
Jesse Duffield 48347d4d86 use fallback approach for applying patch 2019-11-05 19:22:01 +11:00
Jesse Duffield 61deaaddb7 reorder patch command options 2019-11-05 19:22:01 +11:00
Jesse Duffield 0046e9c469 create backups of patch files in case something goes wrong 2019-11-05 19:22:01 +11:00
Jesse Duffield 733145d132 clear patch after successful patch operation 2019-11-05 19:22:01 +11:00
Jesse Duffield f285d80d0e move PatchManager to GitCommand 2019-11-05 19:22:01 +11:00
Jesse Duffield 0ffccbd3ee checks for if we're in a normal working tree state 2019-11-05 19:22:01 +11:00
Jesse Duffield 1fc120de2d better rebase args 2019-11-05 19:22:01 +11:00
Jesse Duffield d5e443e8e3 Support building and moving patches 
WIP
 2019-11-05 19:22:01 +11:00
Jesse Duffield a3c84296bf use array of ints instead of range 2019-11-05 19:22:01 +11:00
Jesse Duffield cc039d1f9b don't unsplit main panel unconditionally on focus lost 2019-11-05 19:22:01 +11:00
Dawid DziurlaandJesse Duffield 2484ec9c11 fix headerRegexp 2019-11-05 19:22:01 +11:00
Dawid DziurlaandJesse Duffield 5f9de1f034 please golang-ci 2019-11-05 19:22:01 +11:00
Jesse Duffield 11e57edbb3 use v keybindings instead of c 2019-11-05 19:22:01 +11:00
Jesse Duffield 820f3d5cbb support split view in staging panel and staging ranges 2019-11-05 19:22:01 +11:00
Jesse Duffield 081598d989 rewrite staging to support line ranges and reversing 
Now we can stage lines by range and we can also stage reversals
meaning we can delete lines or move lines from the working tree
to the index and vice versa.

I looked at how a few different git guis achieved this to iron out
some edge cases, notably ungit and git cola. The end result is
disstinct  from both those repos, but I know people care about
licensing and stuff so I'm happy to revisit this if somebody
considers it derivative.
 2019-11-05 19:22:01 +11:00
Giorgio PreviteraandJesse Duffield a1c6619401 \#480 Close popup panels before switching to a side view 
Reusing the `onNewPopupPanel` function to close existing popup panels
(if any) before switching to a new side view. Alse closing any
confirmation prompt.
 2019-10-27 12:39:08 +11:00
Giorgio PreviteraandJesse Duffield 3524f6baa9 480 - remove duplication by using a decorator 
Also use a for loop to append the new keybindings
 2019-10-27 12:39:08 +11:00
Giorgio PreviteraandJesse Duffield ac5cbc1d2c #480 Allow cycling side panels with number keys 2019-10-27 12:39:08 +11:00
mjarkkandJesse Duffield a045313e08 Removed the pkg/gui/theme.go file 
Moved most functions to the new theme/theme.go
 2019-10-20 12:32:57 +11:00
mjarkkandJesse Duffield 02fef3136f Added light theme option to the settings 2019-10-20 12:32:57 +11:00
Dawid DziurlaandJesse Duffield 379dcf0972 UserConfigPath -> UserConfigDir 2019-09-24 19:01:40 +10:00
Dawid DziurlaandJesse Duffield 0d25d113c9 download updated binary to config dir rather than /tmp 2019-09-24 19:01:40 +10:00
matejcikandJesse Duffield 600112780c use git.autoFetch config option 2019-09-08 11:20:15 +10:00
matejcikandJesse Duffield 4c73c8889f move git config options to top-level in default config 2019-09-08 11:20:15 +10:00
matejcikandJesse Duffield 68d5c2bc10 use gui.g directly 2019-09-08 11:20:15 +10:00
matejcikandJesse Duffield 7db1fee877 startBackgroundFetch does not return errors 2019-09-08 11:20:15 +10:00
matejcikandJesse Duffield 8f786e3fd9 configurable auto-fetch 2019-09-08 11:20:15 +10:00
Dawid DziurlaandJesse Duffield e0dd1cb29d switch to Go modules 2019-09-01 21:24:03 +10:00
Giorgio PreviteraandJesse Duffield 827837b0b9 477 Remove unnecessary variable check 
hasInlineMergeConflicts is always true with hasMergeConflicts is true
 2019-07-27 11:05:23 +10:00
Giorgio PreviteraandJesse Duffield e83ef9858b #477 Remove NeedMerge boolean 
Instead of storing the status in a new variable, derive it from
the existing three fields
 2019-07-27 11:05:23 +10:00
Giorgio PreviteraandJesse Duffield 504d506575 477 Add new NeedReset property to File and update tests 
Use a boolean to determin if a file needs to be reset. We want to reset
the file when discrading changes if there is a conflict.
 2019-07-27 11:05:23 +10:00
Giorgio PreviteraandJesse Duffield 823b436b53 477 Remove duplicate checkout 
We already checout the file calling `c.DiscardUnstagedFileChanges`
 2019-07-27 11:05:23 +10:00
Giorgio PreviteraandJesse Duffield 212327d746 #477 Discard changes when there are merge conflicts 
If there are merge conflicts, reset the file and discard all changes
 2019-07-27 11:05:23 +10:00
Christian MuehlhaeuserandJesse Duffield cc138fc70e Simplified boolean comparison 2019-07-27 10:55:21 +10:00
Christian MuehlhaeuserandJesse Duffield d953712377 err was assigned but never checked 2019-07-27 10:55:01 +10:00
Christian MuehlhaeuserandJesse Duffield 69ac0036e6 Swallow errors entirely, instead of assigning and ignoring them 2019-07-27 10:53:19 +10:00
Christian MuehlhaeuserandJesse Duffield 975a5315b0 Simplified code a bit 2019-07-27 10:52:06 +10:00
Christian MuehlhaeuserandJesse Duffield 8f734b11e3 Removed unnecessary string conversion 2019-07-27 10:51:17 +10:00
Jesse Duffield 75db4faf69 show actual error when trying to check out a branch that doesn't exist 2019-07-14 14:31:48 +10:00
haoweiandJesse Duffield e1f5601d4b fix typo 2019-07-14 14:24:59 +10:00
Giorgio PreviteraandJesse Duffield b60ecdaa24 472 - Update error message 2019-07-14 14:24:18 +10:00
Giorgio PreviteraandJesse Duffield 9fb9962ce7 472 - Don't panic if not in a repository 
Display a friendly message and exit with an error if not
in a Git repository. Using the same approach used in this PR:
https://github.com/jesseduffield/lazydocker/pull/14/files
 2019-07-14 14:24:18 +10:00