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

6505 Commits

Author SHA1 Message Date
cd17b46b55 reset patch builder when we've escaped from the building phase and nothing has been added 2019-11-10 16:18:25 +11:00
d0d92c7697 remove old add patch keybinding 2019-11-10 15:01:40 +11:00
89a9b4e6d5 Update README.md 2019-11-10 10:17:35 +11:00
592a2ff196 Update README.md 2019-11-10 10:07:43 +11:00
17ed90c790 Update README.md 2019-11-10 10:02:04 +11:00
9e0b335669 Update README.md 2019-11-10 09:02:00 +11:00
194c554357 support ours/theirs merge conflict headers 2019-11-08 09:31:27 +11:00
c65790b53d Update README.md 2019-11-06 23:18:03 +11:00
2f37c0caaf fix tests v0.9 2019-11-05 19:22:01 +11:00
86a39e3aea only test with non-original header 2019-11-05 19:22:01 +11:00
326b1ca8c9 better titles 2019-11-05 19:22:01 +11:00
72fe770974 better interface for ApplyPatch function 2019-11-05 19:22:01 +11:00
db8c398fa3 strip whitespace when there is nothing else 2019-11-05 19:22:01 +11:00
861bcc38be fix ambiguous condition 2019-11-05 19:22:01 +11:00
cd3874ffb7 don't let patch manager ever be nil 2019-11-05 19:22:01 +11:00
10fe88a2cf more work on managing focus when applying patch command 2019-11-05 19:22:01 +11:00
1a38bfb76d do not return focus to commitsFiles view after selecting to start a new patch 2019-11-05 19:22:01 +11:00
beaebb7dc7 handling when to show the split panel 2019-11-05 19:22:01 +11:00
6d5d054c30 support line by line additions in staging and patch building contexts 2019-11-05 19:22:01 +11:00
2344155379 handle empty commit in rebase 2019-11-05 19:22:01 +11:00
48347d4d86 use fallback approach for applying patch 2019-11-05 19:22:01 +11:00
61deaaddb7 reorder patch command options 2019-11-05 19:22:01 +11:00
0046e9c469 create backups of patch files in case something goes wrong 2019-11-05 19:22:01 +11:00
733145d132 clear patch after successful patch operation 2019-11-05 19:22:01 +11:00
f285d80d0e move PatchManager to GitCommand 2019-11-05 19:22:01 +11:00
0ffccbd3ee checks for if we're in a normal working tree state 2019-11-05 19:22:01 +11:00
1fc120de2d better rebase args 2019-11-05 19:22:01 +11:00
d5e443e8e3 Support building and moving patches
WIP
2019-11-05 19:22:01 +11:00
a3c84296bf use array of ints instead of range 2019-11-05 19:22:01 +11:00
cc039d1f9b don't unsplit main panel unconditionally on focus lost 2019-11-05 19:22:01 +11:00
2484ec9c11 fix headerRegexp 2019-11-05 19:22:01 +11:00
5f9de1f034 please golang-ci 2019-11-05 19:22:01 +11:00
66eaaf9cbb go mod vendor 2019-11-05 19:22:01 +11:00
87ac193b5e fix module checksum mismatch 2019-11-05 19:22:01 +11:00
11e57edbb3 use v keybindings instead of c 2019-11-05 19:22:01 +11:00
4f2c42ea47 bump gocui 2019-11-05 19:22:01 +11:00
820f3d5cbb support split view in staging panel and staging ranges 2019-11-05 19:22:01 +11:00
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
09f268befc Update FUNDING.yml 2019-10-28 09:43:46 +11:00
4bc974c83c Update FUNDING.yml 2019-10-28 09:43:36 +11:00
63da8f48da Merge pull request #522 from chenrui333/go-1.13 2019-10-27 08:51:03 +01:00
32d6a17240 Upgrade to go v1.13 2019-10-26 21:53:22 -04:00
84d869a3a0 Anchor image tag to specific version 2019-10-26 21:50:27 -04:00
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.
0.8.3
2019-10-27 12:39:08 +11:00
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
ac5cbc1d2c #480 Allow cycling side panels with number keys 2019-10-27 12:39:08 +11:00
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
9bd2dc3050 Updated the config.md 2019-10-20 12:32:57 +11:00
02fef3136f Added light theme option to the settings 2019-10-20 12:32:57 +11:00
8fe0e00cd9 Merge pull request #516 from glvr182/hotfix/path-not-positional
#514 Fix positional flag issue
2019-09-30 21:31:43 +02:00