Dawid Dziurla
87ac193b5e
fix module checksum mismatch
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
4f2c42ea47
bump gocui
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
Jesse Duffield
09f268befc
Update FUNDING.yml
2019-10-28 09:43:46 +11:00
Jesse Duffield
4bc974c83c
Update FUNDING.yml
2019-10-28 09:43:36 +11:00
Dawid Dziurla
63da8f48da
Merge pull request #522 from chenrui333/go-1.13
2019-10-27 08:51:03 +01:00
Rui Chen
32d6a17240
Upgrade to go v1.13
2019-10-26 21:53:22 -04:00
Rui Chen
84d869a3a0
Anchor image tag to specific version
2019-10-26 21:50:27 -04:00
Giorgio Previtera
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 Previtera
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 Previtera
ac5cbc1d2c
#480 Allow cycling side panels with number keys
2019-10-27 12:39:08 +11:00
mjarkk
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
mjarkk
9bd2dc3050
Updated the config.md
2019-10-20 12:32:57 +11:00
mjarkk
02fef3136f
Added light theme option to the settings
2019-10-20 12:32:57 +11:00
Dawid Dziurla
8fe0e00cd9
Merge pull request #516 from glvr182/hotfix/path-not-positional
...
#514 Fix positional flag issue
2019-09-30 21:31:43 +02:00
Glenn Vriesman
f7f19bbc02
Main: Use --path instead of positional
...
* Also puts a placeholder for the merge-todo argument
Signed-off-by: Glenn Vriesman <glenn.vriesman@gmail.com>
2019-09-30 15:08:20 +02:00
Dawid Dziurla
95ae806e09
Merge pull request #414 from glvr182/feature/dir-as-arg
...
Provide git directory as argument to Lazygit
2019-09-24 19:45:46 +02:00
Glenn Vriesman
d8a6f173c3
Mod: Added flaggy to vendor directory
...
Signed-off-by: Glenn Vriesman <glenn.vriesman@gmail.com>
2019-09-24 18:52:52 +02:00
Glenn Vriesman
431f1aa766
Main: Added directory argument
...
* Added a positional argument that allows the user to change the dir
Signed-off-by: Glenn Vriesman <glenn.vriesman@gmail.com>
2019-09-24 18:52:46 +02:00
Dawid Dziurla
379dcf0972
UserConfigPath -> UserConfigDir
2019-09-24 19:01:40 +10:00
Dawid Dziurla
0d25d113c9
download updated binary to config dir rather than /tmp
2019-09-24 19:01:40 +10:00
Dawid Dziurla
7c70913e8d
Merge pull request #513 from jesseduffield/go.sum
...
update go.sum again
2019-09-21 18:30:16 +02:00
Dawid Dziurla
1c5858c515
update go.sum again
2019-09-21 18:02:23 +02:00
Jesse Duffield
c3767bb3b3
update go.sum
2019-09-15 21:16:19 +10:00
Jesse Duffield
b92d27ee7f
force underlying go commands under gox to use the vendor directory
2019-09-15 21:16:19 +10:00
Jesse Duffield
6eff139c40
use vendor directory in test.sh
2019-09-15 21:16:19 +10:00
Jesse Duffield
07462303ab
bump gocui
2019-09-15 21:16:19 +10:00
Jesse Duffield
d12f81b44e
add autoFetch to config doc
2019-09-08 11:20:35 +10:00
matejcik
600112780c
use git.autoFetch config option
2019-09-08 11:20:15 +10:00
matejcik
4c73c8889f
move git config options to top-level in default config
2019-09-08 11:20:15 +10:00
matejcik
68d5c2bc10
use gui.g directly
2019-09-08 11:20:15 +10:00
matejcik
7db1fee877
startBackgroundFetch does not return errors
2019-09-08 11:20:15 +10:00
matejcik
8f786e3fd9
configurable auto-fetch
2019-09-08 11:20:15 +10:00
Dawid Dziurla
1c704e11f2
adjust CI to Go modules
...
relatively brought in line with lazydocker's config
2019-09-01 21:24:03 +10:00
Dawid Dziurla
e0dd1cb29d
switch to Go modules
2019-09-01 21:24:03 +10:00
Giorgio Previtera
827837b0b9
477 Remove unnecessary variable check
...
hasInlineMergeConflicts is always true with hasMergeConflicts is true
2019-07-27 11:05:23 +10:00
Giorgio Previtera
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 Previtera
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 Previtera
823b436b53
477 Remove duplicate checkout
...
We already checout the file calling `c.DiscardUnstagedFileChanges`
2019-07-27 11:05:23 +10:00
Giorgio Previtera
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 Muehlhaeuser
cc138fc70e
Simplified boolean comparison
2019-07-27 10:55:21 +10:00
Christian Muehlhaeuser
d953712377
err was assigned but never checked
2019-07-27 10:55:01 +10:00
Christian Muehlhaeuser
69ac0036e6
Swallow errors entirely, instead of assigning and ignoring them
2019-07-27 10:53:19 +10:00
Christian Muehlhaeuser
975a5315b0
Simplified code a bit
2019-07-27 10:52:06 +10:00
Christian Muehlhaeuser
8f734b11e3
Removed unnecessary string conversion
2019-07-27 10:51:17 +10:00
Tomáš Horáček
17b4cabc71
Add syntax highlighting to Config.md
...
It's easier to read...
2019-07-27 10:48:30 +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
haowei
e1f5601d4b
fix typo
2019-07-14 14:24:59 +10:00
