Given this commit message that contains an ellipsis:

Use URI literals to replace deprecated `Uri.uri("…")` calls

The UI of girb then:

• shows ~@ (with a leading and a trailing space) instead of … in the commit message
• indents the commit message after the one with the ellipsis
• indents the first empty line (consisting of, visibly, only ~) (but not those after that)

Screenshot:

This was discovered using v1.1.0 and successfully reproduced with v1.2.1.

I would nice to have this project available everywhere! I don't have the energy (or knowledge) to provide builds for everywhere the tool could be used. If anyone is willing to create a package I would be grateful!

List taken from ripgrep

• [x] Debian (.deb)
• [x] Homebrew
• [x] FreeBSD (pkg)
• [ ] Linuxbew
• [ ] MacPorts
• [x] Windows Chocolatey
• [x] Windows Scoop
• [x] Arch Linux (pacman)
• [ ] Gentoo (emerge)
• [ ] Fedora (dnf)
• [ ] openSUSE (zypper)
• [ ] Ubuntu (apt - PPA)
• [ ] OpenBSD (pkg_add)
• [ ] NetBSD (pkgin)

If anyone is willing to help please comment below!

At least in my case, there's often a bunch of unused screen real estate, and displaying the help menu (or changing the display of the Actions: bar at the bottom) would be nice. Sort of like WordStar

I work at a Windows shop. Is Windows supported and are there installation packages? I know that ripgrep and fd have Windows executables as part of their CI builds.

Maybe relevant: The Windows issue of rebase-editor for this: https://github.com/sjurba/rebase-editor/issues/7 Which is what I use atm with the mentioned workaround.

When using the d command to show a diff, I am sometimes thrown off by the lack of less keybindings. It would be convenient if we could use $PAGER instead of the built in pager to show diffs. Alternatively, adding less keybindings to the diff view would also be acceptable.

This should give us the basic functionality. It would be nice to eventually parse the raw git diff output so that we could get the data behind a menu. You could view the diff of each file individually.

Thanks for the nice tool.

I got confused by .deb release for v0.4.0 whose filename is git-interactive-rebase-tool_0.3.0_amd64.deb (the same as for the v0.3.0).

The binary itself does neither support the --version command-line option nor seem to tell its version somewhere else.

So after having downloaded a file git-interactive-rebase-tool_0.3.0_amd64.deb its not clear which version it actually is, both before and after installation.

I suggest to provide the common --version option and, if possible, correct the .deb filename of the v0.4.0 release retroactively.

The core.commentChar git configuration has a special value, auto which automatically selects a comment character based on the content of thing being edited:

https://git-scm.com/docs/git-config#Documentation/git-config.txt-corecommentChar

Setting this config breaks this tool:

hint: Waiting for your editor to close the file... Error reading file, Invalid action: #
error: There was a problem with the editor 'interactive-rebase-tool'.

I installed this on macos 10.13 and ubuntu 18.04 via cargo install --git (to get the latest version possible) and set this to be my sequence editor with git config --global sequence.editor interactive-rebase-tool. I get this error when I try to rebase:

Error reading file, (...)/.git/rebase-merge/git-rebase-todo
Reason: Invalid action: %
Could not execute editor

Changing the binary name from git-interactive-rebase-tool to interactive-rebase-tool didn't help.

hi there! just installed this on my mac via homebrew, started a rebase, looked at a commit (c) and then tried to see the full info (d) and got a crash:

thread 'main' panicked at 'byte index 21 is not a char boundary; it is inside...

version info:

• git version 2.35.1
• interactive-rebase-tool 2.2.0 (2022-05-01)

it seems specific to the one commit i was looking at, others seem to work ok!

unfortunately the repo is not open source, but if there's any help i can do get a stack trace or something i'm happy to. seems like a handy tool so i'm hoping i can use it.

The last release was last April, but a lot of changes have been made to the project since then; perhaps at least a new patch release should be published to account for that.

Release checklist:

• [x] Update the release* workflows to include latest versions of Ubuntu, Debian (https://github.com/MitMaro/git-interactive-rebase-tool/pull/649)
• [x] Fix documentation errors (https://github.com/MitMaro/git-interactive-rebase-tool/pull/650)
• [x] Add supported platforms to the README (https://github.com/MitMaro/git-interactive-rebase-tool/pull/658) (https://github.com/MitMaro/git-interactive-rebase-tool/pull/661)
• [x] Test on Windows
• [x] Test on macOS
• [x] Test on Linux
• [x] Update CHANGELOG (https://github.com/MitMaro/git-interactive-rebase-tool/pull/653)
• [x] Bump Cargo.toml version number (https://github.com/MitMaro/git-interactive-rebase-tool/pull/662)
• [x] Update README to remove reference to development build (https://github.com/MitMaro/git-interactive-rebase-tool/pull/662)
• [x] Release crates to crates.io
• [x] Tag new release tag

Found issues:

• [x] Resize event flood causes render lag, needs a debounce (https://github.com/MitMaro/git-interactive-rebase-tool/pull/652)
• [x] Shift + ? not working on Windows (https://github.com/MitMaro/git-interactive-rebase-tool/pull/655)
• [x] ? key does not work during edit (https://github.com/MitMaro/git-interactive-rebase-tool/pull/656)
• [x] Home/end missing from diff help (https://github.com/MitMaro/git-interactive-rebase-tool/pull/657)
• [x] External editor not receiving all inputs (https://github.com/MitMaro/git-interactive-rebase-tool/pull/660)

Can you provide precompiled binaries for armhf and arm64? Those platforms are increasingly popular with Raspberry PIs, Apple M1 (you can run virtualised linux), etc.

Looking at the build scripts it seems that you could use qemu-binfmt support and arm64/debian:... docker images to compile for another arch on a existing runners.

If someone wants to compile binary via docker:

docker run -v "$PWD/arm64:/cargo" -it --rm arm64v8/rust:bullseye cargo install --root /cargo git-interactive-rebase-tool
docker run -v "$PWD/armhf:/cargo" -it --rm arm32v7/rust:bullseye cargo install --root /cargo git-interactive-rebase-tool

Or, just generic way for a current architecture:

docker run -v "$PWD/cargo:/cargo" -it --rm rust:bullseye cargo install --root /cargo git-interactive-rebase-tool

Take into account that this will take quite some time on RPI.

I used git rebase --edit-todo to look at how many commits were left in my rebase, but when i didnt change the file, interactive-rebase-tool cleared the file to abort, and then the rebasing ended, and I had to continue the rebase with a cherry-pick of the remaining commits.

It'd be nice to be able to bind custom keywords to binds The idea is to use it with git-revise, which adds index and cut as available actions

I've hardcoded support for those in https://github.com/dali99/git-interactive-rebase-tool but it'd be better if there was a Custom(String) action or something you could manually bind

Architecturally this seems a little complicated though

Hey,

I'm using your tool for a couple of years now. It's great and helps me a lot in my work. Thanks!

Recently I have noticed that one of my rebase commands has stopped working:

echo $COMMIT_HASH | xargs -o git rebase --interactive

After I run it, the terminal window starts to constantly rerender (multiple times per second) and didn't react to key presses at all. So I have to kill it. I tested it both in the default Terminal.app and iTerm2. I'm using macOS 11.3.1.

Not sure if it's directly related to xargs or something else. Let me know if you need me to provide more info or check something else.

Maybe git-interactive-rebase-tool can show errors in case there would be merge errors, even before the user has exited and saved the editor to continue the rebase.

See example in da-x/depree: Vim ALE checker for Git rebase interactive. Initially I wrote this tool for commit dependency detection, but then I fitted it to perform rebase script linting in my editor.

It is written in Rust and also uses libgit2. It's quite fast, does the conflict checking in memory and it does not affect Git state at all. so should be easy to integrate in. Maybe I can turn depree into a library for git-interactive-rebase-tool to use.