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
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
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
d8a6f173c3 Mod: Added flaggy to vendor directory
Signed-off-by: Glenn Vriesman <glenn.vriesman@gmail.com>
2019-09-24 18:52:52 +02:00
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
379dcf0972 UserConfigPath -> UserConfigDir 2019-09-24 19:01:40 +10:00
0d25d113c9 download updated binary to config dir rather than /tmp 2019-09-24 19:01:40 +10:00
7c70913e8d Merge pull request #513 from jesseduffield/go.sum
update go.sum again
2019-09-21 18:30:16 +02:00
1c5858c515 update go.sum again 2019-09-21 18:02:23 +02:00
c3767bb3b3 update go.sum v0.8.2 2019-09-15 21:16:19 +10:00
b92d27ee7f force underlying go commands under gox to use the vendor directory 2019-09-15 21:16:19 +10:00
6eff139c40 use vendor directory in test.sh 2019-09-15 21:16:19 +10:00
07462303ab bump gocui 2019-09-15 21:16:19 +10:00
d12f81b44e add autoFetch to config doc 2019-09-08 11:20:35 +10:00
600112780c use git.autoFetch config option 2019-09-08 11:20:15 +10:00
4c73c8889f move git config options to top-level in default config 2019-09-08 11:20:15 +10:00
68d5c2bc10 use gui.g directly 2019-09-08 11:20:15 +10:00
7db1fee877 startBackgroundFetch does not return errors 2019-09-08 11:20:15 +10:00
8f786e3fd9 configurable auto-fetch 2019-09-08 11:20:15 +10:00
1c704e11f2 adjust CI to Go modules
relatively brought in line with lazydocker's config
2019-09-01 21:24:03 +10:00
e0dd1cb29d switch to Go modules 2019-09-01 21:24:03 +10:00
827837b0b9 477 Remove unnecessary variable check
hasInlineMergeConflicts is always true with hasMergeConflicts is true
2019-07-27 11:05:23 +10:00
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
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
823b436b53 477 Remove duplicate checkout
We already checout the file calling `c.DiscardUnstagedFileChanges`
2019-07-27 11:05:23 +10:00
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
cc138fc70e Simplified boolean comparison 2019-07-27 10:55:21 +10:00
d953712377 err was assigned but never checked 2019-07-27 10:55:01 +10:00
69ac0036e6 Swallow errors entirely, instead of assigning and ignoring them 2019-07-27 10:53:19 +10:00
975a5315b0 Simplified code a bit 2019-07-27 10:52:06 +10:00
8f734b11e3 Removed unnecessary string conversion 2019-07-27 10:51:17 +10:00
17b4cabc71 Add syntax highlighting to Config.md
It's easier to read...
2019-07-27 10:48:30 +10:00
75db4faf69 show actual error when trying to check out a branch that doesn't exist 2019-07-14 14:31:48 +10:00
e1f5601d4b fix typo 2019-07-14 14:24:59 +10:00
b60ecdaa24 472 - Update error message 2019-07-14 14:24:18 +10:00
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
25c93c678d Create FUNDING.yml 2019-06-30 09:50:28 +10:00
b8baef7b8f use fork of roll that doesn't care about errors 2019-06-29 20:56:46 +10:00
235a47bb80 Revert "emergency situation: we're not logging to rollrus while we're past the request quota"
This reverts commit c107eed890.
2019-06-29 20:56:46 +10:00
c107eed890 emergency situation: we're not logging to rollrus while we're past the request quota 2019-06-24 12:29:44 +10:00
abddea060e revert menu panel error panel usage 2019-06-08 20:29:25 +10:00
3e40369fd2 add GIT_OPTIONAL_LOCKS=0 env var to all commands 2019-06-06 20:53:35 +10:00
0f0fda1660 allow stashing staged changes
reinstate old stash functionality with the 's' keybinding
2019-06-06 20:50:19 +10:00
bd2170a99c request explicit return from subprocess
Previously we were recording output from subprocesses using a multiwriter
and hooking that up to the cmd's stdout to write to both os.Stdout and
a buffer. We would then display the output after the program finished.

This worked well for commands like 'ls' but not for commands like 'vi'
which expect you to be in a tty, and when you've got the cmd's stdout
pointing at a multiwriter, the subprogram thinks we're not in a tty
and then things like terminal corruption can happen. This was the case
with neovim, and even in vim a warning was given with a pause before
starting the program.

Now we're chucking out the multiwriter and instead making it that you
need to press enter after the program has finished to return to lazygit.
This allows you to view the output of the program (e.g. if it's ls) and
then decide that you want to return. It's one level of unnecessary
redirection for editors like vim, but even they could potentially have
output to stderr/stdout that you want to look at before returning.

 Please enter the commit message for your changes. Lines starting
2019-05-26 21:19:54 +10:00
c039e5bed0 support going to start/end of line and deleting lines in simple editor 2019-05-26 12:42:17 +10:00
527c025a0c use shift+j/k to scroll main, ctrl+j/k to move commits 2019-05-25 16:48:17 +10:00
53cded77f1 fix padding with coloures strings 2019-05-19 15:25:33 +10:00
4a4dc676fc simplify code for logging output of subprocess 2019-05-18 11:30:10 +10:00
c61bfbdd4c Support opening lazygit in a submodule v0.8 2019-05-12 17:59:49 +10:00
e38d9d5f22 Add alternatives for scroll actions to context map 2019-05-12 16:20:42 +10:00
97f060d38d Add field Alternative to gui.Binding
Document and use alternative keybinding for generating cheatsheet. Add
alt keybinding fn+up/down for scroll up/down actions.

Also run `go run scripts/generate_cheatsheet.go`.
2019-05-12 16:20:42 +10:00