gh-f VS delta

gh-f is a GitHub CLI extension that I wrote that does all-things-fzf for git. From time to time I add new small features or quality of life adjustments :).

If you are into github CLI extensions, check out the ultimate fzf git extension: gh-f (unrelated to neovim, but shamelessy I am the author).

I deal with most of my git workflow from terminal simply because I find git to be easiest to use from the command line, where each command is verbose enough for you to understand what you are doing, and so is its output. Lately, with the introduction of the gh CLI things have gotten even easier, and all the workflow of branches, PRs, releases, runs and so forth is easily handled via command line as well: I wrote gh-f, an extension that integrates gh with fzf and you're good to go at the speed of light.

I have worked on gh-f for about one year and I have now reached the point where I consider it to be stable and robust enough to award it a full 1.0.0 release.

You may want to check out gh-f, where most of the functions/alias shown in the videos are packaged as gh CLI extension.

Nice, wasn't aware of that. Enjoying looking at the code underneath https://github.com/gennaro-tedesco/gh-f/blob/master/gh-f

gh cli with some gh extensions, like gh-f, gh-s, and gh-i, can get you most of the way there

If you are interesting in cherrypicking (and much more) you may want to have a look at gh-f, a GitHub CLI extension that works with fzf (in particular look at gh f -k)

Another feature added to gh-f: grep regex pattern through revision history. What about that piece of code you deleted, and now you want to quickly check the old revision file to copy and paste? Say no more: prompt for regex pattern, choose the file name, browse the revision history with preview and show the old file containing the piece of code you are after!

Thanks for the difftastic & zoxide tips.

However, I've been using this git pager/difftool: https://github.com/dandavison/delta

While it's not structural like difft, it does produce more readable output for me (at least when scrolling fast through git log -p /scanning quickly

View on GitHub

I'm currently waiting on the integration between Delta and Difftastic:

https://github.com/dandavison/delta/issues/535

Difftastic now has JSON output, whic should make it much easier to build this.

I'm surely in the minority here. I've been using Emacs for almost a decade now, but I just can't get into the Magit workflow. I've tried several times, but always end up going back to Git on the command line. I have dozens of aliases, shell integrations, a nice diff viewer[1], etc., and interacting with Git has become muscle memory. I can commit, cherry-pick, rebase, bisect, fix conflicts, etc., in a fraction of the time it would take me to navigate Magit's UI. I'm sure with enough practice, a Magit user could do this more quickly and efficiently, but honestly, with some custom-built porcelain, Git's UI is not so bad. Though this could very well be Stockholm syndrome after using it for such a long time...

For whatever reason, Magit's opinionated workflows never clicked with me. A part of it is the concern that it will do something weird to my repo that I'll then have to waste more time undoing manually. I usually don't trust sugary wrappers around tools. And another is the fact I don't use Emacs on all machines, and setting up Git on a remote system is just a matter of copying over my config and some shell integrations.

Also, on a more personal note, I find the cultish fanboyism whenever Magit is brought up slightly offputting. Does anyone have anything bad to say about it? No software can realistically be this infallible. :)

[1]: https://github.com/dandavison/delta

For looking at diffs I still prefer the command line though, and use delta to view diffs between commits or branches.