git-stack VS toggleterm.nvim

I'm not seeing a git compatibility layer? So I think it's a neat project, but I probably won't try it because nearly all code is rooted squarely in git. Even if Pijul is perfect, you'd need to convince everyone else to use it.

Nevertheless, the increased interest in moving to patch based workflows from branch based ones is great. There's a lot of similar tools here (https://github.com/gitext-rs/git-stack/blob/main/docs/compar...) which I refer to infrequently.

Personally my favorite tool for living-with-the-reality-that-is-branches is git-machete (https://github.com/VirtusLab/git-machete).

This is huge. I've wasted so much time on this, I wrote my own tool. No idea how thoroughly they've implemented this though (what all corner cases does it update or not)

> Probably some arcane git magic to (interactively) rebase branch

There is not really a command for that yet, short of adding a bunch of `exec` steps to your interactive rebase manually. See https://news.ycombinator.com/item?id=32217204 for an upcoming command.

You might enjoy using https://github.com/gitext-rs/git-stack, which specifically tries to let you manage stacked branches locally while not exposing tons of PRs to your coworkers.

git-branchless itself also lets you manage stacked branches in various ways. For example, you can do `git checkout `, `git commit --amend`, and then `git restack` to rebase all the descendant branches sensibly. You can use it on the local side of things only and then use Github PRs as normal.

I've been using termtree in my applications but I'm needing something more like git log --graph for git stack but haven't found a general purpose one (there is an implementation inside of git branchless) and haven't had a chance to make one myself.

Got a comparison of tools in this space at https://github.com/gitext-rs/git-stack/blob/main/docs/comparison.md

I try to keep the number of branches down but git-stack provides something like git log --graph that collapses branches from other users and old branches, keeping the main view clean.

Checkout https://github.com/gitext-rs/git-stack/blob/main/docs/compar... (note, the tool hosting this page is not included but as the author).

As the author of git stack, with all relevant biases, I recommend

- git stack for automating what you are already doing

- git branchless for more power at the risk of incombatibilities because its only as good as the data fed to git hooks

- jj if your open to something very different

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