←back to thread

Show HN: I made a git rebase TUI editor

(github.com)
115 points NyuB | 3 comments | 13 Oct 24 20:03 UTC | HN request time: 0.409s | source

I use interactive rebase quite often, and particularly like the editor bundled with IntelliJ. But I do not always work with IntelliJ, and am not 'fluent' with Vim, so I tried to replicate roughly the same rebase experience within a TUI. I used a small TUI OCaml project i made last year.

The notable features are: - Move commits up and down, fixup, drop - Rename commits from the editor (without having to stop for a reword during the rebase run) - Visualize modified files along commits - 'Explode' a commit ,creating a commit for each modified file (a thing I found myself doing quite often)

Feedbacks (both on the tool and the code) and contributions welcome, hope it could fit other people needs too !

1. lostdog ◴[14 Oct 24 16:32 UTC] No.41839107[source]▶
I wish there were a good TUI for handling merge conflicts. Vimdiff seems to be the closest, but doesn't have keyboard bindings for 3-way merges.

Nothing beats Meld for me, but if you're on a remote GUI-less machine, there aren't good options.

replies(2): >>41839333 #>>41839614 #
2. shawn_w ◴[14 Oct 24 16:52 UTC] No.41839333[source]▶
emacs' smerge has always worked well for me.
3. arcanemachiner ◴[14 Oct 24 17:18 UTC] No.41839614[source]▶
Lazygit works well for merge conflicts (and many other things):

https://github.com/jesseduffield/lazygit

(I am not actually sure what a three-way merge conflict is though TBH.)