sublime_merge
delta
sublime_merge | delta | |
---|---|---|
27 | 88 | |
270 | 20,765 | |
1.1% | - | |
0.0 | 8.1 | |
8 months ago | 4 days ago | |
Rust | ||
- | MIT License |
Stars - the number of stars that a project has on GitHub. Growth - month over month growth in stars.
Activity is a relative number indicating how actively a project is being developed. Recent commits have higher weight than older ones.
For example, an activity of 9.0 indicates that a project is amongst the top 10% of the most actively developed projects that we are tracking.
sublime_merge
- I don't know why so many devs avoid a GUI for Git
- Sublime Merge – Git Client from the Makers of Sublime Text
- Ask HN: How to give a crash course on Git?
-
Lazygit: Simple terminal UI for Git commands
I've used this before and it is great. I mainly use Sublime Merge these days, though: https://www.sublimemerge.com/
-
Ask HN: Dev productivity tools you would pay for
Other good graphical git clients I have used in the past are Sublime Merge https://www.sublimemerge.com/ and SmartGit https://www.syntevo.com/smartgit/.
They are usually not expensive, and I learned git with GUIs.
- Top 10 Git GUI Clients for Linux in 2023
- Exploring the Top 10 Git GUI Clients for Linux in 2023
-
3 way merge tool as good as IntelliJ?
I’m in the same boat. The best I’ve come up with is sublime merge, works well but I miss the keyboard shortcuts and it being part of the editor
-
The github CLI saved me a lot of times
Even though I am pretty comfortable (or was) with git cli, I'm not going back from sublime merge
-
#gitPanic - Tools
Personally, I find it really helps me to see the repo history visualized as a tree, so I currently use Sublime Merge. I've used GitKraken and Sourcetree in the past. The git reference documentation maintains a list of git GUI clients, including mobile apps!
delta
- Difftastic, a structural diff tool that understands syntax
- Popular Git Config Options
-
So You Think You Know Git – Git Tips and Tricks by Scott Chacon
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
-
Essential Command Line Tools for Developers
View on GitHub
- Potencializando Sua Experiência no Linux: Conheça as Ferramentas em Rust para um Desenvolvimento Eficiente
-
Unified versus Split Diff
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.
- Delta, a syntax-highlighting pager for Git, diff, and grep output
- Ask HN: What's a new developer tool you recently started using?
-
Magit
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
-
How to use Git?
For looking at diffs I still prefer the command line though, and use delta to view diffs between commits or branches.
What are some alternatives?
legit - Git for Humans, Inspired by GitHub for Mac™.
diff-so-fancy - Good-lookin' diffs. Actually… nah… The best-lookin' diffs. :tada:
git-gui - Tcl/Tk based UI for Git. I am currently acting as the project's maintainer.
difftastic - a structural diff that understands syntax 🟥🟩
GitUp - The Git interface you've been missing all your life has finally arrived.
vim-fugitive - fugitive.vim: A Git wrapper so awesome, it should be illegal
GitExtensions - Git Extensions is a standalone UI tool for managing git repositories. It also integrates with Windows Explorer and Microsoft Visual Studio (2015/2017/2019).
lazygit - simple terminal UI for git commands
desktop - Fork of GitHub Desktop to support various Linux distributions
vim-gitgutter - A Vim plugin which shows git diff markers in the sign column and stages/previews/undoes hunks and partial hunks.
terraform-provider-wireguard - Terraform provider for WireGuard metadata
gitui - Blazing 💥 fast terminal-ui for git written in rust 🦀