v0.7.1
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!