Sublime Merge(sublimemerge.com) |
Sublime Merge(sublimemerge.com) |
cm is exactly how I think of commit, but I use it as a custom command on the cli.
I use my cm command like:
cm “Small refactoring of quux and baz”
and it runs
git commit -m “Small refactoring of quux and baz”
Similarly I have other two letter commands for all of the other git operations I most frequently use. (I.e for almost all of the ones I use day to day.)
I don't like it as much as a generic git frontend (nothing beats the command line once you're used to it, but for 3-way merges, it's absolutely perfect and I have yet to see anything better.
Another very good tool for 3-way merges is meld, but the macOS port (where I do most of my development work on) is not very good, mostly because the GTK macOS port isn't very good.
Try Beyond Compare v5.
It’s not good at getting an overview of your history or blaming, but for committing and merging it is really nice
What I like about Sublime Merge is its performance and the stage/unstage UI/UX is intuitive and fast backed by a competent text editor engine, similar to what I liked about Magit. Having multiple repositories open in a tab interface is also nice.
What you have to keep in mind is that Sublime Merge also includes a competent merge tool (hence the name). Sometimes we have to do more complex merges and Sublime Merge does this in an intuitive and integrated way, which would be a completely separate application in many other popular Git front-ends. Therefore the price is IMHO fair and justified. I can recommend giving it a try for a couple of weeks.
At first I lost my trust and then I liked vsc more.
We've since added that functionality to the updater. We also don't nag paying customers regardless of whether their license applies.
"update_check": false
Fast as opposed to what? What could possibly be slow here? It's just local git operations.
100ms let alone 3s is much too long a wait, so Sublime Merge predicts the outcome of staging and presents that immediately. This made a noticeable improvement to responsiveness even on small repositories under Linux.
So, "predicts outcome", what does that even mean? I know the outcome of `git add` is... the file being added. And it has to run the command in the end anyway.
I am a visual and spatial type, so I find the the way the information is organised there invaluable. I know I lose points for not being an ultimate shell dweller, but the experience just does not compare.
The only downside is that sometimes you cannot be sure which commands it will execute for a given functionality, and to do more specific things you have to do them manually. I guess this is unavoidable.
You don't lose a single point for using tools that fit your needs, no matter how much any gatekeeper says different.
I'm curious if you have a specific example of this? We've put a fair amount of effort into having the same nomenclature as git and add tooltips that contain the command itself where possible.
I don't mind the Git CLI, but I don't enjoy using it. It feels like I'm doing extra work and I'm not necessarily on top of the changes I've made. But Sublime gives me that while also not straying far from the CLI. It's the best client I've come across and well worth the license I paid for it.
People need to get paid somehow.
@ben-schaaf I'd love to see tree-sitter+LSP come to Sublime Text, as well as telescope+rg+fzf style fuzzy search. I find the lazyvim+telescope integration for finding files, finding buffers, looking for symbol references and general grepping with the live preview just fantastic.
One of the things I don't like about nvim+lazyvim is that I miss the IDE (workspace) aspect of ST, in that I have a window open per active project in Sublime. I use Neovide for nvim, but it really only lets you have one GUI window (I don't like to use Kitty/terminal windows for nvim because I can't cycle easily through them without mixing through other terminal stuff).
I use Sublime Merge only as a diff tool, or a review tool before the commit. Love it as well.
As a user of both, what draws you to sublime merge for those actions even though you likely already have intellij open for the same project?
Thx!
Both against standalone tools such as Git-Fork, and built it tools such as VSCode Git [for the majority of the world that uses VSCode over Sublime-Text].
OpenGL → https://www.sublimetext.com/blog/articles/hardware-accelerat...
But a tremendously hard sell in 2024 considering the plethora of tools out there right now.
> Cloud? Why? You can literally do anything on a VPS with Postgres!
> AI? Not on my watch! I can't imagine a tool that does more than VIM two decades ago!
> Javascript?! What a shit language. Everything should be written in Java or C++.
In my case I don't want to maintain a server, but a web service, hence I'd prefer cloud most of the time.
> AI? Not on my watch! I can't imagine a tool that does more than VIM two decades ago!
There are a few instances where it's useful, but if you abuse the use of AI (copilot and co), then you will most likely not understand the code the same way if you were the one that wrote it, even if it is a 1:1 match.
> Javascript?! What a shit language.
Indeed Javascript is bad language, but it's hard to avoid if you work on the frontend, WASM is not yet there to be an alternative for most use cases.
> Everything should be written in Java or C++.
I would say at this point in time you will most likely to get away with Go (instead of Java) or Rust (instead of C++).
* it doesn't do a good enough job following renames (in cases where you would need to use `--follow` to `git log`. `git gui blame` does.
* while there is a "blame parent commit" feature, it's a bit hidden and it's super slow to provide the updated blame.
As an example: Lets say it takes 200ms to run `git add` and then another 100ms to read the index; you want to stage 3 files. You click the first stage button, nothing happens and you move to click the next stage button, now the UI updates and removes that first file shifting what you're about to click on. This behavior was extremely annoying when it came up in testing.
With prediction here's what happens instead: You click the first stage button, immediately the UI updates removing that file, you move to click the 2nd which again is immediately removed. Transparently in the background `git add` is run and we confirm the end the result is as predicted.
https://www.sublimemerge.com/download
https://www.sublimetext.com/download
And they have dev releases.
https://www.sublimemerge.com/dev
https://www.sublimetext.com/dev
Its mature software that doesn't require a constant churn of bug fixes and updates, that's not a bad thing.
Destroyed the whole st ide setup (plugins didn't work for st4) And st3 licence can't be used for st4 (you get the st4 licence if you bought st3 some months before)
If I use st for private stuff that would be annoying, but as I use it for my work that was money.
ST4 has full backwards compatibility for plugins, keeping the same python 3.3 ST3 shipped with, so I'm surprised your setup broke. ST3 licenses were also fully transitioned to ST4, so any license less than 3 years old covered the initial ST4 release.
Speaking personally, I enjoyed Sublime Text, so I was happy to pay for a license back in the day ($70 if I recall?). When v2 came out, I paid to upgrade, and again with v3. When v4 was released, I paid yet again, but after a period of normal use (a year if I recall), I got a popup informing me I'd need to pay again to keep using ST4. I felt like I'd been hoodwinked--they had sneakily switched the license from perpetual to subscription.
I assume that the switch to subscription licensing was disclosed somewhere in the small print that nobody reads. I feel that the concealment was deliberate (I suspect they'll disagree, but you know the old chestnut about the relative volume of actions and words). At that point I'd been using v4 for a year, and rolling back to v3 with my previously perpetual license would be a big hassle, and obviously I'd lose functionality.
I would have happily kept paying for upgrades, but now I doubt I'll ever spend money with those folks again.
If your regular license only covered a year of updates that's certainly a bug and I suggest contacting sales@sublimetext.com so we can sort that out.