Lazygit-py

Changelog
New features:
- Viewing the files in a commit (press enter on a commit):
- removing changes to a file from an old commit
- checkout out a version of a file from an old commit
- Custom commands with shift+X on the files panel
- Adding fixup! commits and squashing all fixup commits above a specified commit. shift+F on a commit creates a fixup commit based on that commit. shift+S on a commit squashes all above fixup commits
- Option to auto-stash when checking out another branch with unstaged changes
- More options for discarding file changes
- More options for resetting to a commit (hard/soft/mixed)
- Add a WIP commit that skips the pre-commit hooks with the 'w' keybinding on the files panel
- Commit message is now retained if a pre-commit hook fails
- Better UI on small windows (huge thanks to mjarkk !)
- Ability to open lazygit from within a submodule directory
- More informative keybinding cheatsheets (thanks to sudo-suhas !)

Also loads of bugfixes

If I've forgotten anybody's contributions, please let me know and I'll add them to the changelog :)

Changelog

Fixed an issue created in v0.7.0 that caused high CPU usage, now the CPU usage is back to being negligible

Changelog

REBASING:


Do you want to rebase your branch on top of another one, or perhaps do an interactive rebase involving the commits on your branch? This is now possible! Press 'r' on a selected branch and you will rebase onto that branch. If conflicts arise and you want to skip/continue/abort, press 'm' to view the
merge/rebase options menu.

If you want to interactively rebase, there are lots of new commands for the commits panel. For example:
- e: edit the commit
- s: squash the commit
- f: fixup the commit
- p: pick the commit (while in a rebase state)
- d: drop the commit
- r: reword the commit subject line
- R: reword the commit with you selected editor
- J: move the commit up
- K: move the commit down
- A: amend your staged changes to the current commit

You can do these directly, or if you are already in a rebase state, you can set the edit/pick/squash/fixup/drop/reword values on the commits that remain in the 'todo' section, then hit 'm' and select continue to continue the rebase.

Special thanks to glvr182 for starting this feature off

CHERRY-PICKING:


If you press 'c' on a commit, it will be copied. Shift+C will copy a range of commits. If you then press 'v' on the commits panel in another branch, the copied commits will be cherry-picked across in the same order as they appeared before.

MOUSE-SUPPORT:

This isn't fully done yet so it's turned off by default, but if you turn it on in your config by setting gui.mouseEvents: true, you will be able to use your mouse to focus panels, scroll panels, and click on files to stage/unstage them. When this has a bit more testing I'll turn the option on by default.

This is a very large release so there is bound to be some bugs. Please create an issue if you come across any problems, or if you think a feature could be designed a little better. Happy coding!

Changelog

e39d2ed Added check to invoke continue/refresh
a1ee11e Added error check to satisfy ci
670f0e3 Added rebase functions
27994f7 Added rebase handler
88c01c1 Added rebase keybinding
7a7e885 Added rebase support commands
7b850c5 Added some translations
34fd18a Error handling
95d451e Make it easier to run sync/async commands, switch to interactive rebase when rebasing on branches
9489a94 Make merge panel its own panel
cce6f40 Making ci happier
3d343e9 Merge branch 'master' into feature/rebasing
6430ab6 Merge branch 'master' into feature/rebasing
0c886ed Revert "remove old rebase code now that we're only ever interactively rebasing"
7a2176f acknowledge 'DU' statuses as being merge conflicts
790235f add another match on the error message to tell us we've encountered merge conflicts
daca07e add loading panel
d446381 add various interactive rebase commands
ac5088e allow both enter and space to execute menu item
1337f6e appease golangci
75ab8ec catch rebase errors and show in error panels
f4938de change type of cherryPickedCommits from []string to []*Commit
23c51ba cleanup
ad93b4c consider whether the view has focus when rendering the contents of a view
abc0f7f copy lazygit directory into docker container
adc2529 dealing better with errors at the top level
639df51 decolorise strings before calculating padwidths
399346c disable mouse feature until its ready
0079015 distinguish between inline and non-inline merge conflicts
935f774 don't autostash when editing
e0bdfad don't crash if we have no lines to stage
ab81f27 don't show stack trace if lazygit is started outside of a git repo
7a170bb extend cheatsheet generator to contain context based keybindings
d967f65 fix git tests
cb372d4 fix golangci errors
273678f fix issue where you couldn't rearrange commits while rebasing onto a branch
4de31da fix up tests
f07fc31 fixup layout issue that was causing crashes when the window was too small
8305d8e hide donate button if mouse events are disabled
43758cb i18n for rebase loading states
19a3ac6 improve script for making a test repo
198cbee introduce panel contexts and more work on rebasing
cdc50e8 more support for files with spaces
e011e9b more work on rebasing feature
e0ff46f more work on rebasing including visual indicators
8c0ea8f mouse support
a365615 only use subprocess for merging, not rebasing
dbb01b0 populate dutch and polish i18n files with new messages
77faf85 post-merge cleanup
c101993 post-merge cleanup
e36899d prevent crashes when scrolling up
dcc7855 pull commit list builder functions into their own builder struct
f6b3a9b rearranging todo items while interactively rebasing
43ab731 remove HasMergeConflicts struct instance variables
1a19b14 remove old rebase code now that we're only ever interactively rebasing
88ba6ef remove outdated TODO
76a27f4 rename any commit
afbc028 revert to the old keybinding for stash: I don't want anybody accidentally deleting changes they are trying to stash
a8e22ed show interactive rebase commits that are yet to go
4bb577a show loading status for rebasing events
6c1d2d4 some i18n and restricting rewording during interactive rebase
a8858cb support cherry picking commits
0173fdb support file renames
a5d2776 support user configuring mouse events to be enabled
34acaf7 support users with gotest for coloured test output
e09f390 update go.mod
e331dfc update i18n
cfe3605 use go-errors package to display stacktrace of errors that cause panics
0a12987 use sh intead of bash for the sake of testing on the docker image
8925b16 windows support for skipping the editor
0228e25 work towards more interactive rebase options
9661ea0 wrap amend command in a confirmation

Changelog

* You can now stage lines/hunks! Hit enter on a file to enter the view, and then hit space to stage the selected line. This is the first cut and in the future it will be easier to un-stage lines as well.
* If git asks for a username/password, you can enter them from within the app. Thanks to mjarkk!
* You can fast-forward branches (e.g. master and develop) without checking them out.
* Fixed bug where the recent repos menu was too tall. Thanks to KOREAN139!
* Tab spacing is now shown in the main panel.
* Clearing the working tree is now faster.
* You can now generate a cheatsheet for the app in your language. We will later automatically generate this with each release. Thanks to dawidd6!

If you have contributed some code in this release but I've forgotten about you, please let me know!
Stay Lazy!

Changelog

You can now open pull requests directly from lazygit! In the branches panel, pressing 'o' will open your browser with your pull request ready to go. Thanks kristijanhusak For this feature!

The workflow for force deleting a branch is smoother: you just hit 'd' to delete the branch, and if it has unmerged changes you'll get prompted for a confirmation to force delete it. Thanks rozuur!