jskinner

My pleasure, and thanks for the kind words!

Not yet sorry! FWIW the best place for news is in the Discord channel: https://discord.gg/D43Pecu

There are only minor changes in this build: a few bug fixes, plus notarization support, which is required for macOS 10.15.

We've got some pretty exciting changes coming up quite soon, but this isn't it.

We do defer to Git for all write operations, but for reading, we do it ourselves partly for efficiency, and partly to get the right data.

In terms of getting the right data, one example is that we need to know the full set of non-ignored sub-directories in the working directory, so we can watch them for changes. It's easy enough to generate this ourselves as we calculate the status output, but I don't believe that git will emit it.

In terms of performance, we rely on being able to read objects efficiently. For example, to show a commit, we can't just use the output of "git diff", as we need the full file contents to be able to calculate syntax highlighting correctly. You could go a long way with "git cat-file --batch", but there are plenty of contexts where you can't practically batch requests, and process creation costs + the lack of caching across requests (which can be quite significantly due to the delta encoding of objects) would be quite significant.

It's not configurable, but you can click on the "Working Directory" head to collapse all the files there, which will make seeing the Staged changes easier

Git hooks will be run, as all mutating actions go through git itself, however pre-commit hooks may not work as you expect with this setup. When you commit via Sublime Merge, it's doing a git commit -m "...", which works differently with git hooks than a plain git commit.

We use the system Git by default on Mac if it's installed, but it sounds like that's not working for you. If you set your git_binary preference to "bundled", we'll use the one that comes with Sublime Merge instead.

Sorry about that - I missed a part in our Windows installer, and ssh-askpass-sublime.exe isn't being installed. This will be resolved in the next day or two, in the mean time the portable version has it - https://www.sublimemerge.com/download

It's not exposed via the command line right now

Thanks for your support!

We have hidpi support on every platform.

If your dpi scale isn't being detected correctly on Linux, you can set it explicitly via the dpi_scale setting (there are instructions elsewhere in this thread)

The billing period isn't changed, instead a pro-rated amount is changed. For example, if you add a seat half way through the billing period, you'll be changed half the normal amount for it. Reducing seats will result in a pro-rated credit on your next billing cycle.

Menus and dialogs (open, save, error, etc) :)

There isn't right now, but there will be a new build out soon that will work with this.

Thanks for the kind words!

https://forum.sublimetext.com/ is the best place for feedback atm.

1. You can setup two rulers via adding "rulers": [50, 72] to Commit Message.sublime-settings, which is available via the Preferences menu.

2. We don't have Swift syntax highlighting out of the box, but if you have it installed for Sublime Text, we'll pick it up

3. Thanks for the report, I'll investigate

Right click a commit, and it's under the Edit Commit sub-menu

I built a prototype of it at one point, but was running into performance issues trying to get pixels onto the screen.

I'd like to revisit this, as the hidpi experience really is a lot better with GTK3.

You can drag the top or bottom of a diff to see more context at any time, but there's no setting to change the default number of context lines - I'll add a note for it

You can use the dpi_scale setting for this in Sublime Merge and Sublime Text, but you'll have to restart after changing it. You'll need to edit the JSON settings directly for this (via Preferences/Edit Settings), and then set dpi_scale to something reasonable, such as 1.25

We pick up the default GTK dpi settings, and if that's not suitable, you can use the dpi_scale setting to set it specifically (you'll have to restart Sublime Merge after changing it though).

I run Sublime Merge on high dpi screen under Linux every day FWIW.

Thanks for the report, I'll get it addressed

That's still supported, and the same technique works for Sublime Merge, fwiw.

The middle pane is toggleable between the merge results and the base file

Alas, one of our key principles is to not hide or rename anything in Git, so your knowledge from using Git on the command line transfers to and from Sublime Merge.

We'll 100% be adding integration in that direction too. A new build of Sublime Text shouldn't be too far off, there are some nice thing's that we've added into Sublime Merge (e.g., an update theme system), that I want to roll into Sublime Text.

With regards to Stage All, we don't have a button, but we do have a key binding: Command+Shift+A to stage all Modified files, and then press it a second time to stage all Untracked files, if desired.

Interactive rebase is absolutely coming (you can already edit commit messages and squash commits). UI support for Git Flow is going to depend on user feedback. I expect we will eventually, but even if not, we will be adding a plugin API, and it would naturally be doable via that.

FWIW you can also press the Search icon/key binding again to get out of it, or use the Back button on the toolbar. I agree that it's not at all obvious from a visual point view - I'll see what we can do.

Absolutely, I'll add it to the list.

Oh yes!

We do have some basics in there right now, you can directly edit commit messages and squash commits without any fuss. Full interactive rebase support will be coming later.