1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-11 12:48:10 +03:00
Commit Graph

2693 Commits

Author SHA1 Message Date
f15e47bb67 add file watching for modified files
log createErrorPanel error

swallow error when adding file to watcher
2019-11-14 22:22:47 +11:00
7995d56a85 allow editing or opening a file while resolving merge conflicts 2019-11-14 22:22:47 +11:00
3b1d705473 show upstream branch for branch 2019-11-13 22:25:42 +11:00
f43ba728e3 prompt to set upstream when pulling on untracked branch
prompt to set upstream when pulling on untracked branch
2019-11-13 21:36:16 +11:00
12b84307ac specify upstream when pushing a branch for the first time 2019-11-11 23:30:30 +11:00
cbc82cd3c1 allow for changing the current directory on exit
For this to work you'll need to put this in your ~/.zshrc (or equivalent rc file):

lg()
{
    export LAZYGIT_NEW_DIR_FILE=/Users/jesseduffieldduffield/Library/Application\ Support/jesseduffield/lazygit/.lastd

    lazygit "$@"

    if [ -f $LAZYGIT_NEW_DIR_FILE ]; then
            cd "$(cat $LAZYGIT_NEW_DIR_FILE)"
            rm -f $LAZYGIT_NEW_DIR_FILE > /dev/null
    fi
}
2019-11-11 21:45:31 +11:00
e174e5254d support clicking through to commit files panel 2019-11-10 22:32:13 +11:00
de5bcb8b9c add some shameless self promotion 2019-11-10 22:32:13 +11:00
98666186ee add '?' keybinding for opening options menu 2019-11-10 22:32:13 +11:00
941d3c6648 allow secondary view to be scrolled 2019-11-10 22:32:13 +11:00
df72eee201 don't try to give a logrus entry object to gocui 2019-11-10 22:32:13 +11:00
131113b065 simplify how the context system works 2019-11-10 22:32:13 +11:00
e85310c0a9 add mouse support 2019-11-10 22:32:13 +11:00
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
194c554357 support ours/theirs merge conflict headers 2019-11-08 09:31:27 +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
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
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
d5e443e8e3 Support building and moving patches
WIP
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
11e57edbb3 use v keybindings instead of c 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
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
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
02fef3136f Added light theme option to the settings 2019-10-20 12:32:57 +11:00
600112780c use git.autoFetch config option 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
975a5315b0 Simplified code a bit 2019-07-27 10:52:06 +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
abddea060e revert menu panel error panel usage 2019-06-08 20:29:25 +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
4a4dc676fc simplify code for logging output of subprocess 2019-05-18 11:30:10 +10:00
e38d9d5f22 Add alternatives for scroll actions to context map 2019-05-12 16:20:42 +10:00