git-stack VS toggleterm.nvim

git-stack is the most complicated, rewriting history, detecting when a branch was squashed, etc

I used to use aliases but got frustrated with them when dealing with PRs depending on PRs, so I wrote git-stack [0]. Thought I'd share in case you'd find it useful

[0] https://github.com/epage/git-stack/blob/main/docs/reference....

For anyone interested, I've been collecting notes on various tools in this space: https://github.com/epage/git-stack/blob/main/docs/comparison... (granted the page doesn't mention git-stack since that is assumed)

Personally, I rebase my PR branches on top of each other, rather than merge. It creates a cleaner history (if your merge policy allows maintaining branch history). Tired of managing these branches, I wrote a tool to help though there are other tools in this space, like git-branchless and graphite.

git-move and git-branchless do some great stuff, I wish this wasn't focused on the performance side to distract from the real value.

What I find useful is not the performance but this line

> For example, it can move entire subtrees, not just branches

The referenced docs mention other great quality of life improvements that streamline standard workflows (e.g. deleting local PR branches when merged into upstream)

When performance does matter is when the rebase operation is a small part of a larger operation. In my related tool, git-stack [0], I rebase all branches on top of their latest upstream branches along with re-arranging and squashing fixup commits and soon other features. When automating entire workflows, having each part be fast is important for the whole to still have decent performance.

[0] https://github.com/epage/git-stack

audit for security audits - Separate from regular CI since it only matters for specific changes or when new critical issues come out.

You might be interested in git-stack that I've previously announced

Could you comment on https://github.com/epage/git-stack/issues/25 for why it helps to iterate to find the last non-conflicting commit to rebase onto?

git-stack is the result of me being tired of annoyances in the PR workflow and trying to improve it, like

Fixing branches off of branches when applying a fixup commit (not implemented yet)

As a data point, I'd like to chime in here. I have been a 15 year user of tmux (and screen before that) and never thought I'd change my development habits. Over the holidays I decided I would do one of those once-every-five-years upgrades to my vim setup as I had accrued dozens of vendored plugins in normal vim and wanted to see what the big deal with neovim was.

I bit the bullet and evaluated some of the "distributions" (AstroNvim and kickstarter) and played around with all the new lua plugins that I had never thought I needed (why use telescope when FZF-vim worked so well?).

Anyways, after a month of tweaking and absorbing, I found myself running Neovide only, and doing something I never thought I'd see, running tmux from within neovim/neovide. I think this only works (for me) because of session management (there are half a dozen plugins for handling quickly changing 'workspaces') and because the built-in terminal (with a very useful plugin called toggleterm: https://github.com/akinsho/toggleterm.nvim) works so well.

I have not stopped using tmux and layouts, and it sits in another fullscreen iterm2 workspace, but I find that I now spend 90% of my time using a fullscreen neovide and summoning/toggling tmux momentarily for running commands.

Of course, the caveat here is that my preferred mode of operation is being fullscreen as often as possible. I think if your preferred mode of operation is to always see splits then running neovim from the terminal within tmux is still the way to go.

As for why I like neovide? I find the animations, when tweaked to be less 'cool' are extremely useful to see where the cursor jumps to. I am also a huge fan of the fact that I can finally use 'linespace' to put some space between my lines of code -- it is an aesthetic I didn't realize I wanted.

For splitting the terminal you could try either toggleterm or tmux. If you want to send things from one tmux pane to another, then you can use slime. For a toggle-able filetree, you can use nvim tree.

I just found toggleterm which feels awesome. Pretty much exactly what I was looking for to use with Alacritty but even better since its integrated into the rest of my Neovim workflow.

I saw this plugin that tells me how to do it, however I got confused after I added "require("toggleterm").setup({})" in the lazy.lua file and installed the package as well using the Lazy command

I tried toggleterm but I wasn't successful.

And I never really got into Gitsigns or vim-fugitive. Lots of people love them, so I'm sure they're great, but I'm happy opening a floating terminal with Toggleterm and using Lazygit.

I agree with u/Bamseg, but you can get what you want using toggleterm.nvim BUT NOT IN FLOAT.

I use gitsigns for linewise operations (blame, reset, etc), and a floating terminal (toggleterm) for everything else. flatten.nvim also helps with nested nvim instances.

but I ended up finding a good enough workaround by using Lazygit through Toggleterm.

Perhaps you want something like https://github.com/akinsho/toggleterm.nvim and make a custom profile? Remapping a key for each extension seems fine as well, just remap it per-buffer inside of on_attach