News for hackers. Stuff that matters.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by jskinner on Thursday September 20, 2018 @03:37AM (#18030450)
Hi HN - Jon Skinner here, I made Sublime Text and Sublime Merge, alongside the rest of the Sublime HQ programming team - Will, Dylan and Benjamin. Let me know if you have any questions!

Edit: there's also the announcement blog post, at https://www.sublimetext.com/blog/articles/sublime-merge

Re:Show HN: Sublime Merge – A Git client from the makers of ... by vmsp on Thursday September 20, 2018 @04:20AM (#18030613)
Jon, it's impressive how you deliver incredibly performant cross-platform UIs. You really should consider talking about your development and custom widget toolkit.

Great job on Sublime Merge.

Re:Show HN: Sublime Merge – A Git client from the makers of ... by interknot on Thursday September 20, 2018 @02:14PM (#18034427)
Emphatically agreed. I've wanted to hear about this for years.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by boromi on Tuesday October 02, 2018 @04:34PM (#18125479)
I am interested in this too, however the team seems very secretive about this aspect of the project.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by mixmastamyk on Thursday September 20, 2018 @02:50PM (#18034637)
I've never experienced a non-performant cross-platform UI.

Well, to be honest I've heard of folks complaining about Electron apps, but are easy enough to avoid. Oh yeah and Swing was a bit sluggish… in the 90s.

What am I missing?

Re:Show HN: Sublime Merge – A Git client from the makers of ... by mixmastamyk on Thursday September 20, 2018 @04:20PM (#18035148)
Still no answers but a lot of malicious downvotes.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by chipotle_coyote on Thursday September 20, 2018 @04:55PM (#18035379)
Allow me to somewhat quippishly rephrase your original post: "I've never heard of badly performing cross-platform apps, except for the ones written in what's currently the most popular cross-platform toolkit and the ones written in one of the most popular cross-platform toolkits a generation ago."
Re:Show HN: Sublime Merge – A Git client from the makers of ... by mixmastamyk on Thursday September 20, 2018 @05:15PM (#18035533)
That leaves one poor performing toolkit, that has an excuse at least. Not hard to avoid apps written in it, in any case.

Qt, Wx, Java, and many others don't or no longer perform poorly. So why the surprise there is one more? Maybe some folks don't know they exist.

Re:Show HN: Sublime Merge – A Git client from the makers of ... by 1st1 on Thursday September 20, 2018 @12:48PM (#18033811)
Jon, if you're looking for ideas what to work on next, please consider creating an email client. With fast UI & search, tree view for emails, proper support of plain text emails etc.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by n42 on Thursday September 20, 2018 @01:30PM (#18034131)
This is one of those things that I didn't know I needed. An email client made for power users with the speed, simplicity and flexibility of Sublime Text (and now Merge) would be the end of all of my email woes. I would pay a lot of money for this.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by arbie on Thursday September 20, 2018 @01:58PM (#18034320)
And then they add Exchange support and the whole thing slows to a crawl.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by codethief on Thursday September 20, 2018 @02:08PM (#18034395)
I know that, in terms of UI, this is not precisely the SublimeText equivalent of an email client but have you taken a look at notmuch[0]?

It basically operates on your local Maildir which you can keep in sync with your mail server by using a tool like OfflineIMAP[1].

[0] https://notmuchmail.org/

[1] http://www.offlineimap.org/

Re:Show HN: Sublime Merge – A Git client from the makers of ... by unhammer on Thursday September 20, 2018 @02:23PM (#18034479)
Or mbsync[1] – I've found it faster and more stable than OfflineIMAP.

[1] http://isync.sourceforge.net/mbsync.html

Re:Show HN: Sublime Merge – A Git client from the makers of ... by AsyncAwait on Thursday September 20, 2018 @02:05PM (#18034369)
Agreed. I would pay quite a lot for a native email client that respects your privacy.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by bytematic on Thursday September 20, 2018 @02:20PM (#18034467)
Have you tried mailspring?
Re:Show HN: Sublime Merge – A Git client from the makers of ... by n42 on Thursday September 20, 2018 @02:35PM (#18034549)
Mailspring looks nice. I would like the metadata to be under my control and not synced to their servers. The fact that I need to login to their machines turns me off. I'm open to running my own instance of their server. I do not like requiring "the cloud" to use my email client.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by c-smile on Thursday September 20, 2018 @03:02PM (#18034727)
Sciter's author here.

I am considering creation of EMail client, as a next step of my https://notes.sciter.com.

The Sciter Notes resembles email client UI pretty close, so UI portion is feasible in months time frame.

At the mean time I am doing html-notepad that has also close UI: https://sciter.com/html-notepad-new-kid-in-the-block/

If someone knows IMAP/POP/SMTP stuff and want to join or invest into the project - please let me know.

I believe it is finally the time to make convenient email client.

Re:Show HN: Sublime Merge – A Git client from the makers of ... by stevekemp on Sunday September 23, 2018 @12:48PM (#18051900)
> in months time frame.

I'm going to assume you meant you could start in a month, rather than be completed in a month, because otherwise I'd like to save you some pain!

I wrote a mail client, two actual, focussed upon the console. (Think "scriptable mutt".) Writing a mail-client is hard. Partly due to the sheer amount of bogus mails you'll get, and partly due to people having very firm beliefs about what they want.

The user-interface is the easy part. More important is to design how you're going to work - Originally I allowed something similar to google's tagging, so you could "open a folder" which contained mail from multiple Maildir collections. It was not a success.

Using a database to store your state is a cheap alternative, but risks issues getting outdated if you ever interact with the mail outside your program. You either have to force an "indexing" step - like notmuch does - or scan the filesystem tree. Neither of those approaches are great, for obvious reasons.

(Also God help you if you want to work with remote IMAP servers. Standards? What are they!)

Re:Show HN: Sublime Merge – A Git client from the makers of ... by johntash on Sunday September 23, 2018 @12:08AM (#18049348)
I only recently learned about sciter, and was pretty excited to start using it on a personal project. Thanks for that!

I'm not exactly an expert on imap/pop/smtp, but I'd potentially be interested in helping depending on what your plans are for it. Honestly I'd be happy to help with any new privacy-focused e-mail client that has a convenient ui.

Re:Show HN: Sublime Merge – A Git client from the makers of ... by jimyl on Thursday September 20, 2018 @01:12PM (#18033984)
That's definitely a brilliant idea. I wish Jon like this one.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by zchrykng on Thursday September 20, 2018 @11:42AM (#18033272)
I almost purchased before downloading it just because of how much I trust you and your team to make high quality software, and as a way to throw more money in your direction.

Been messing with it for a few minutes and it is awesome. Been looking for a good Sublime-like git tool for years.

Re:Show HN: Sublime Merge – A Git client from the makers of ... by jskinner on Thursday September 20, 2018 @04:43PM (#18035297)
Thanks for the kind words!
Re:Show HN: Sublime Merge – A Git client from the makers of ... by coldtea on Thursday September 20, 2018 @04:10AM (#18030576)
Totally appreciate your ST work Jon (main driver for 6+ years, used Vim before for 15+ years). Will definitely try Merge.

Does it offer any integration with Sublime itself (e.g. if someone has a license for both)?

Re:Show HN: Sublime Merge – A Git client from the makers of ... by jskinner on Thursday September 20, 2018 @04:16AM (#18030601)
Thanks for the kind words! There's some basic integration now, and we'll be adding more in the future.

Right now, Sublime Merge will pickup installed Sublime Text packages (e.g., for syntax highlighting), and will also find Sublime Text when you choose Open in Editor from within Merge (this can be customised to something else though, of course).

Re:Show HN: Sublime Merge – A Git client from the makers of ... by nicoburns on Thursday September 20, 2018 @05:37AM (#18030940)
It would be cool to have some integration going the other way. In particular I would love:

1. If Sublime Text could detect when a directory is a git root directory, and present a button to "open in sublime merge" (my sublime projects often span multiple git repos, so detection on a folder by folder basis would be key). The ability to configure this to use another git client would make sense, although personally Sublime Merge looks fantastic.

2. A create commit action accessible from the Command-Shift-P dialog. I imagine Sublime Merge launches pretty quickly, so this would be pretty nice as I wouldn't have to keep it open: I could just let Sublime Text manage my "workspace". I currently commit using the terminal (+ Micro Editor), but this could be even better. Note: I notice that there is no "Stage All" button. That would be useful...

Aside: IMO managing workspaces/projects is a weakness of Sublime Text atm. I have tendency to move directories around which makes managing projects a bit awkward. I've resorted to opening sublime from the terminal with `cd /path/to/project/; subl .`. Not sure I have any specific suggestions for improvements, but that welcome screen in Sublime Merge sure looks nice...

2. Merge tool integration for file merging/diffing (e.g. if two files are selected in the sidebar, you could right-click > diff files, and perhaps an action on an open file could be "diff file with..."). There are plugins for Sublime Text that try to do this with two text panes, but they don't work especially well. IMO there aren't very many good diff tools, so a lightweight one that works cross-platform could be a good market to target.

Thank you for Sublime Text. I've used it almost every day for work for the last 5 years and it's definitely made my life much easier!

Re:Show HN: Sublime Merge – A Git client from the makers of ... by jskinner on Thursday September 20, 2018 @06:10AM (#18031067)
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.

Re:Show HN: Sublime Merge – A Git client from the makers of ... by kemayo on Thursday September 20, 2018 @06:01PM (#18035796)
Speaking as the sublime-text-git person, something with official deeper integration would honestly be appreciated. There's a few common UI requests which something official would probably pick off as low-hanging-fruit but which are basically impossible with the current API. :D
Re:Show HN: Sublime Merge – A Git client from the makers of ... by gmandx on Thursday September 20, 2018 @11:51AM (#18033360)
Just asking software engineering perspective, would be better to have the code that integrates Sublime Text <-> Sublime Merge as plugins? As in, the same Python plugin system that ST3 offers today?
Re:Show HN: Sublime Merge – A Git client from the makers of ... by gbersac on Thursday September 20, 2018 @05:46AM (#18030961)
This a million time. With VSCode being more popular than sublime text now, not having first class git integration just after installing sublime text is a serious reason not to use it.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by marmaduke on Thursday September 20, 2018 @10:20AM (#18032602)
SublimeGit?
Re:Show HN: Sublime Merge – A Git client from the makers of ... by coldtea on Thursday September 20, 2018 @11:47AM (#18033321)
Yeah, but actually integrated...
Re:Show HN: Sublime Merge – A Git client from the makers of ... by coldtea on Thursday September 20, 2018 @06:01AM (#18031025)
Thanks, the fact that they can share packages (and eventually maybe themes) sounds great.

If it's possible, I'd also like some auto-sync mode (e.g. when a folder with a git repo is opened/active in sublime text, have sublime merge automatically switch to that).

Eventually, perhaps Merge can just be an extra tab (or something similar), inside ST, for people with both licenses.

Re:Show HN: Sublime Merge – A Git client from the makers of ... by vladdanilov on Thursday September 20, 2018 @08:10AM (#18031658)
Nice to see you're using the same animation technique [1]. MP4 could not possibly provide this level of quality/size (~150KB per animation).

Pngcrush is rather limiting though. I could compress the PNG textures by ~8% more with optimage [2] (I'm the author).

And for newer browsers, serving the textures as brotli-compressed BMPs would actually make them >30% smaller (probably more with filtered but uncompressed PNGs).

[1] http://www.sublimetext.com/~jps/animated_gifs_the_hard_way.h...

[2] https://getoptimage.com

Re:Show HN: Sublime Merge – A Git client from the makers of ... by wbond on Thursday September 20, 2018 @09:20AM (#18032186)
We built the animations using a slightly enhanced version of anim_encoder, which I currently have online at https://github.com/wbond/anim_encoder. One of the changes was adding pngquant which helped compress the images a bunch beyond pngcrush.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by vladdanilov on Thursday September 20, 2018 @11:00AM (#18032904)
You will get better results by swapping the two. Pngquant stops at color quantization.

Also, most of those savings came from near-optimal Deflate compression.

Re:Show HN: Sublime Merge – A Git client from the makers of ... by wbond on Thursday September 20, 2018 @11:28AM (#18033152)
Thanks for the tip!
Re:Show HN: Sublime Merge – A Git client from the makers of ... by eridius on Thursday September 20, 2018 @03:17PM (#18034815)
Is there any official channel for feedback?

I just opened this on my repo and there's 3 immediate things I noticed:

1. The commit message UI sprouts a subtle 72 column marker when I put text in it, which is nice. But what it's missing is the even more subtle 50 column marker that I expect for the first line. Standard git commit style says the first line should try to be shorter than 50 chars because it's frequently shown as a summary and you don't want it truncated. Other tools like GitUp and GitX handle this nicely.

2. The diff view doesn't seem to have syntax highlighting for .swift files. I see highlighting for Tcl and Obj-C so I can confirm it's highlighting in general, but nothing for Swift. This is a rather surprising omission.

3. I can't actually commit using this app at all, because it seems to think I have no configured user details. Trying to commit pops up a dialog for me to set it either globally or locally. But I do already have it configured globally. In fact, I have it configured globally twice. I have it first in ~/.git/config, and then I also have it overridden in ~/.git/config.local, and my ~/.git/config has an [include] section that specifies `path = config.local`. I'm wondering if Sublime Merge is getting confused by that include and throwing away my entire global config?

Re:Show HN: Sublime Merge – A Git client from the makers of ... by jskinner on Thursday September 20, 2018 @04:42PM (#18035294)
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

Re:Show HN: Sublime Merge – A Git client from the makers of ... by jazoom on Thursday September 20, 2018 @10:44PM (#18036842)
On the topic of setting the user details, that UI element stretches across the entire width of the area, right up until the "Nothing to commit" button. A few times I clicked in that "empty" space to close a dropdown menu and was wondering why the "set user details" dialog popped up.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by mescalito on Thursday September 20, 2018 @08:49AM (#18031931)
Looks very nice! Two things I noticed right out on a projet:

- It doesn't seem to be picking up my global .gitignore file. I see untracked changes of something that should be ignored. It doesn't appear on any other git client nor `git status`.

- Please add regex to the search :)

Re:Show HN: Sublime Merge – A Git client from the makers of ... by guthriej on Thursday September 20, 2018 @08:11AM (#18031670)
I often commit in a detached HEAD state (primarily because we're using Gerrit, and git-review sort of encourages it). Sublime Merge won't let me commit without being on a branch. Is there any way to get around this?
Re:Show HN: Sublime Merge – A Git client from the makers of ... by jskinner on Thursday September 20, 2018 @04:46PM (#18035324)
There isn't right now, but there will be a new build out soon that will work with this.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by faitswulff on Thursday September 20, 2018 @09:46AM (#18032374)
The search functionality looks great - I didn't even know that was an issue because I generally know how to dig through commits, but having a simple and fast UI for doing it might tip it over into the "must have" category.

EDIT - read the blog post and idly wondering if you would ever consider licensing Sublime's UI engine?

Re:Show HN: Sublime Merge – A Git client from the makers of ... by robin_reala on Thursday September 20, 2018 @11:12AM (#18033022)
I work a lot with repos with very long line lengths (regularly up to 10k characters) and have to often check and merge multiple changes per line. I really like Git clients that can do one or all of these things:

- Block a small threshold of vertical scrolling when scrolling horizontally on a trackpad to stop the current line I‘m tracking wavering up and down as I scroll.

- Highlight whether there are further changes on the same line in some way (e.g. Git Fork starts a highlight at the first change and stops it at the last).

- Allow some sort of merge comparison with word wrapping turned on (I‘m yet to find a client that does this).

If you can get the first, and one of the second or third in, then I‘ll happily pick up a Sublime Merge licence to go with my Sublime Text one. I do understand that this isn‘t a typical merge environment, but I’m editing ebooks with long paragraphs.

Re:Show HN: Sublime Merge – A Git client from the makers of ... by rdco on Friday September 21, 2018 @09:40AM (#18039592)
For your third point, maybe try out Kaleidoscope (macOS/iOS only):

https://www.kaleidoscopeapp.com/

You can map git difftool to it to launch it from the command line.

Re:Show HN: Sublime Merge – A Git client from the makers of ... by robin_reala on Sunday September 23, 2018 @02:39PM (#18052466)
Hey thanks, that actually looks really good! Will try it now.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by ryanmonroe on Thursday September 20, 2018 @12:45PM (#18033792)
Sounds like it might be easier to just write a program which inserts line breaks after periods (and one to remove them), so you can edit the books in their typical format and export to "git format" to deal with versioning/branching/etc. Although it sounds like you've been doing this for a while so there's probably some reason this wouldn't work which I don't know.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by levani on Thursday September 20, 2018 @04:18AM (#18030608)
Do you have any plans to add a debugger GUI in sublime? Integrated git tooling and debugger is the main reason I use VS Code.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by slifin on Thursday September 20, 2018 @01:46PM (#18034234)
100% this, I have to switch between multiple editors because the ergonomics of sublime are too good but it's debugger is not

Trying to migrate away using spacemacs but it's not going well

Re:Show HN: Sublime Merge – A Git client from the makers of ... by outcoldman on Thursday September 20, 2018 @12:51PM (#18033835)
Hey Jon! Thank for building Sublime Text and now Merge! Long time user.

Question about Sublime Merge, is it possible to use smerge as a diff tool without git?

Seems like it is not possible right now. Curious, if you are planning to add this in the future.

Re:Show HN: Sublime Merge – A Git client from the makers of ... by consto on Thursday September 20, 2018 @05:04AM (#18030795)
Had a little play with it and it's looking really promising. I'm probably going to stick to the terminal for simpler stuff, but this tool will definitely help pry me away from Gitlab, and the merge conflict resolution feature looks so much better than my current workflow.

I have a question, or rather a request. As a long term Sublime Text user I like to hide the menu bar which you can't seem to do in Sublime Merge. Would you consider adding this in a future release?

Re:Show HN: Sublime Merge – A Git client from the makers of ... by jskinner on Thursday September 20, 2018 @05:08AM (#18030810)
Absolutely, I'll add it to the list.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by nateweiss on Thursday September 20, 2018 @10:23AM (#18032620)
While you are fielding little requests, I'd personally like to be able to collapse/expand the areas in the "Location Bar" pane/drawer on the left (where branches/tags/stashes are listed). For instance, I often have a lot of local branches and would like to be able to focus on them rather than the remote branches. As it stands there isn't much vertical real estate for each of the lists, and there doesn't appear to be a way to resize/collapse them. SourceTree on Mac treats these as collapsible in an accordion-like way, which I personally like, but I'm sure there would be other good approaches too.

Not a huge problem because there's the cool branch list/switcher at top center, so maybe will find myself working with the Location Bar hidden mostly.

Re:Show HN: Sublime Merge – A Git client from the makers of ... by PJRO on Thursday September 20, 2018 @04:34AM (#18030678)
Hi Jon, we currently use Gitkraken, which allows us to manage submodules. I can't seem to find this functionality in sublime merge, do you know if this is something you guys have thought about and if it will be released any time soon?
Re:Show HN: Sublime Merge – A Git client from the makers of ... by jskinner on Thursday September 20, 2018 @04:37AM (#18030695)
Sublime Merge understands submodules, but we don't expose a UI for managing them yet. This is right near the top of our priority list though.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by hwestbrook on Thursday September 20, 2018 @10:32PM (#18036807)
+1 on this. I use Tower which has really nice submodule support.

In demoing Sublime Merge — if I move branches that use a different submodule or different submodule version, I get uncommitted changes, either a folder where the submodule was or commit change on submodule.

Other than this it looks great!

Re:Show HN: Sublime Merge – A Git client from the makers of ... by jhasse on Thursday September 20, 2018 @07:15AM (#18031337)
Any plans to switch from Gtk+ 2 to 3 on Linux? Scaling of native dialogs isn't very good with HiDPI displays atm :/
Re:Show HN: Sublime Merge – A Git client from the makers of ... by jskinner on Thursday September 20, 2018 @08:15AM (#18031701)
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.

Re:Show HN: Sublime Merge – A Git client from the makers of ... by openbasic on Thursday September 20, 2018 @11:33AM (#18033185)
Wait... you use GTK on Linux? For what, exactly?
Re:Show HN: Sublime Merge – A Git client from the makers of ... by guessmyname on Thursday September 20, 2018 @03:10PM (#18034784)
> Wait... you use GTK on Linux? For what, exactly?

SublimeText uses "Skia Graphics Library" to draw the entire user interface.

However, you still need to write Cocoa for macOS components and GTK for Linux.

Many cross-platform programs do the same, developers use a high-level library to render the overall interface, but underneath they are still using the native graphics libraries offered by the operating system where the program is running in, in this example, macOS and Linux. You can still do a lot with Skia alone, but eventually you'll find yourself writing some platform-specific custom code.

Re:Show HN: Sublime Merge – A Git client from the makers of ... by jskinner on Thursday September 20, 2018 @04:48PM (#18035338)
Menus and dialogs (open, save, error, etc) :)
Re:Show HN: Sublime Merge – A Git client from the makers of ... by sammorrowdrums on Thursday September 20, 2018 @06:03AM (#18031037)
What are the chances of being able to "switch mode" from Sublime text itself? What would be killer for me is to do some work, and then jump to this view to commit / review changes / pull in other changes - I appreciate that it's a very different mode, but the integration would really help. Looks great so far!
Re:Show HN: Sublime Merge – A Git client from the makers of ... by neslinesli93 on Thursday September 20, 2018 @05:20AM (#18030865)
Awesome stuff, I'm loving it! I guess it's time do finally ditch GitKraken and SourceTree (:

I have a couple questions: - Do you have a plan to add git flow integration? And what about interactive rebases? - Please, please, allow free users to use dark theme as well! Sublime Text license was really great, why add such a small change?

Re:Show HN: Sublime Merge – A Git client from the makers of ... by jskinner on Thursday September 20, 2018 @05:35AM (#18030933)
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.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by the_clarence on Thursday September 20, 2018 @05:54AM (#18031000)
Also, if you can rename all these opaque commands to be more user friendly :) even if this means adding more commands, I think it’s worth it. “Rebase” should be the first victim
Re:Show HN: Sublime Merge – A Git client from the makers of ... by jskinner on Thursday September 20, 2018 @06:18AM (#18031102)
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.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by porker on Thursday September 20, 2018 @06:35AM (#18031168)
Are UI translations possible? If so, and someone can replace "Rebase" in the translation with another word, it's possible.

Bonus if the other strings contain placeholders e.g. "Interactive #{rebase|ucfirst}" to reduce the changes.

Bravo Jon, SourceTree has been sucking more and more recently, and as a Windows & Mac user I'm looking forward to trying this out.

Re:Show HN: Sublime Merge – A Git client from the makers of ... by the_clarence on Thursday September 20, 2018 @06:53AM (#18031253)
There are so many types of very different rebase that I don’t think a simple translation would simplify the flow
Re:Show HN: Sublime Merge – A Git client from the makers of ... by the_clarence on Thursday September 20, 2018 @06:52AM (#18031248)
Fair enough, maybe think of this as an optional feature for the future :) you must be really good with git but most people need to google how to do something everytime they want to do something more complicated then a merge
Re:Show HN: Sublime Merge – A Git client from the makers of ... by alexeldeib on Thursday September 20, 2018 @01:34PM (#18034159)
Personally, I believe letting every UI or toolchain compatible with git settle on their own phraseology for identical operations will lead to more issues than we currently have. Git is definitely complex, flags unclear, and commands awkward from time to time. Now, imagine trying to figure out the meaning of commands when they don't even translate equivalently across tooling? Sounds like a nightmare to me. I appreciate the effort to stay consistent with git itself.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by boundlessdreamz on Thursday September 20, 2018 @08:03AM (#18031601)
How do you squash commits?
Re:Show HN: Sublime Merge – A Git client from the makers of ... by jskinner on Thursday September 20, 2018 @08:18AM (#18031712)
Right click a commit, and it's under the Edit Commit sub-menu
Re:Show HN: Sublime Merge – A Git client from the makers of ... by ochenvoysim on Thursday September 20, 2018 @09:46AM (#18032376)
I have to pay for a dark theme? seriously? You should sell features like in-app-purchases then. $1.99 for this, $.99 for that, etc. $80, $99.... man your software is really really good, but when there's free competitors that are on par w/yours, those prices are steep imo. I know you've heard all this before... guess the hundred dollar dark theme got me
Re:Show HN: Sublime Merge – A Git client from the makers of ... by jazoom on Thursday September 20, 2018 @10:48PM (#18036857)
I might be inclined to agree with you, but it seems to me it's not a $99 dark theme as much as it is an unrestricted trial version that you should buy for $99 even if you continue using it with the light theme.

I think it's actually good of the developers not to impose DRM, but it seems that confused you into thinking this is free software?

Re:Show HN: Sublime Merge – A Git client from the makers of ... by olalonde on Thursday September 20, 2018 @05:47AM (#18030967)
> Do you have a plan to add git flow integration?

What does that mean? Isn't git flow just a branching model?

Re:Show HN: Sublime Merge – A Git client from the makers of ... by hannasanarion on Thursday September 20, 2018 @07:09AM (#18031313)
Yes, but one that's popular enough for there to be special commands for it in most git clients, including the one in the ubuntu repos.

git flow init = git init; git branch develop; git checkout develop; ```

``` git flow feature start add login page = git branch develop feature/add-login-page; git checkout feature/add-login-page; ```

``` git flow feature finish = git checkout develop; git merge develop feature/add-login-page; git branch -d feature/add-login-page; ```

Re:Show HN: Sublime Merge – A Git client from the makers of ... by sideproject on Thursday September 20, 2018 @08:07AM (#18031634)
What! You guys are based in Sydney?!?!? Never knew that. Great to see my favourite tool being built in my city! :)
Re:Show HN: Sublime Merge – A Git client from the makers of ... by tombert on Thursday September 20, 2018 @10:34AM (#18032702)
Just to be a bit annoying; I know a ton of people that download SublimeText and just ignore the little thing saying "Sublime is licensed software please pay", though I find that long term it does lead to them getting their employer to pay for it. Is SublimeMerge going to have a similar model?

Just a sidenote, good on you for keeping SublimeText fast and optimized. There are way too many systems out there that have moved to the "put every single application ever inside a self-contained chrome". I usually recommend Sublime before I recommend Atom because of this.

Re:Show HN: Sublime Merge – A Git client from the makers of ... by guu on Friday September 21, 2018 @12:01AM (#18037079)
It has a similar model. Instead of the pop up you can't choose a different theme (ex: dark theme) unless you buy a license.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by Tecuane on Thursday September 20, 2018 @07:52PM (#18036270)
Looks like I have to be "that one", this time:

Given there's a custom Git library in use under the hood, I don't suppose there'll be Mercurial support in the future?

Re:Show HN: Sublime Merge – A Git client from the makers of ... by shoyer on Friday September 21, 2018 @12:13PM (#18040719)
+1 for Mercurial support. I suspect there are enough Google and Facebook engineers using Mercurial to justify basic support :).
Re:Show HN: Sublime Merge – A Git client from the makers of ... by klageveen on Thursday September 20, 2018 @04:47AM (#18030737)
Pretty amazing feat to enter what looks like a saturated market with a product that has a a unique combination of features, is super performant and cross platform. Kudos.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by flipgimble on Thursday September 20, 2018 @02:13PM (#18034421)
The one killer feature I'm hoping some GUI client implements is the ability to seamlessly search and filter branches by just typing the way most IDE's implement search for symbols or files. I work on large active projects that use git flow and inevitably there are dozens of branches. Sourcetree in particular is slow and painful in this scenario and I would love to replace it.

Sublime Merge is looking very responsive and cleanly organized. Great job!

Re:Show HN: Sublime Merge – A Git client from the makers of ... by explainplease on Thursday September 27, 2018 @01:50AM (#18082334)
> the ability to seamlessly search and filter branches by just typing the way most IDE's implement search for symbols or files.

Magit does this in Emacs, especially when used with Helm.

Re:Show HN: Sublime Merge – A Git client from the makers of ... by jazzyjackson on Thursday September 20, 2018 @03:51AM (#18030505)
Allo, looking forward to trying it. One question for you, could you compare it to other standalone git merge options? What don't the competitors do that you do?

But PS, you have a broken link on the /download page

  <a href="/https://www.sublimehq.com/store">purchased</a>
Of course that leading slash will break things -- you could drop the whole `/https:` too.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by jskinner on Thursday September 20, 2018 @04:09AM (#18030572)
Sublime Merge is a Git client, and I'd list the main advantages over the alternatives as performance, and UI polish in general.

For example, when you stage a file in Sublime Merge, we internally predict the resulting change to the repository, so the changes are reflected in the UI immediately, while the operation is actually happening asynchronously. In contrast, other Git clients can take seconds before being able to stage a second file.

Re:Show HN: Sublime Merge – A Git client from the makers of ... by jazoom on Thursday September 20, 2018 @10:41PM (#18036833)
Hi Jon, I just tried it out and I really love it. 20MB of memory, super fast, intuitive to use. Tick, tick tick.

There's just one thing I found really annoying and it's that the window doesn't remember where I snap it to (Windows). Every time I open it I have to snap it to half my display again. GitKraken (and as of a month ago, VS Code) remember where they belong.

Re:Show HN: Sublime Merge – A Git client from the makers of ... by alex_suzuki on Thursday September 20, 2018 @07:38AM (#18031462)
Hi Jon, amazing work! I am happy to try this out as I'm starting to get annoyed with SourceTree, it often hangs on me.

Is there a way to delete a local tracking branch and its corresponding branch on the origin in one operation? I often use this when cleaning up old branches that have been merged into the main development lines.

Re:Show HN: Sublime Merge – A Git client from the makers of ... by adonese on Thursday September 20, 2018 @03:51AM (#18030504)
I think i'll like this tool a LOT!

Thanks for the great work! No single text editor in my life i love as much as sublime!

Re:Show HN: Sublime Merge – A Git client from the makers of ... by owaislone on Thursday September 20, 2018 @06:59AM (#18031284)
Congratulations for launching another promising product Jon. I tried it on Linux and couldn't figure out a way to scale the interface on a higher resolution screen. Increasing the font size only scales half of the UI. Is there any hidden setting to scale or zoom in/out?
Re:Show HN: Sublime Merge – A Git client from the makers of ... by jskinner on Thursday September 20, 2018 @07:15AM (#18031341)
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
Re:Show HN: Sublime Merge – A Git client from the makers of ... by owaislone on Friday September 21, 2018 @03:08PM (#18041917)
Thanks. That worked out perfectly!
Re:Show HN: Sublime Merge – A Git client from the makers of ... by maxymoos on Thursday September 20, 2018 @07:15AM (#18031336)
There is indeed: I tried the same way as in Sublime Text and hurrah, it works.

Go to Preferences > Edit Settings, then add a new setting to the dict: `"dpi_scale": 2.0` (or whatever float value works for you)

I think you need to restart Sublime Merge then.

Re:Show HN: Sublime Merge – A Git client from the makers of ... by fishtopher on Thursday September 20, 2018 @05:40AM (#18030947)
Hi! I love sublime and I'd love to use this too, but.. it crashes 100% of the time for me, whether I open an existing repo or create a new one. Is there a crash log or something I can send to you guys?
Re:Show HN: Sublime Merge – A Git client from the makers of ... by azag0 on Thursday September 20, 2018 @04:51AM (#18030754)
Any plans to implement interactive rebase in some way? Right now I'm heavily dependent on GitUp, where things like swapping commits or squashing them is often a matter of a single keyboard shortcut.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by jskinner on Thursday September 20, 2018 @04:55AM (#18030768)
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.

Re:Show HN: Sublime Merge – A Git client from the makers of ... by mstade on Thursday September 20, 2018 @06:16AM (#18031096)
Are you also moving Sublime Text to a subscription license for businesses?
Re:Show HN: Sublime Merge – A Git client from the makers of ... by desmondw on Thursday September 20, 2018 @04:56PM (#18035386)
Thank you for allowing scrolling past the end. Seriously.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by cknoxrun on Saturday September 22, 2018 @01:47PM (#18047005)
Hello Jon, I bought Sublime Merge a few days ago and am excited to see Dark Mode, but the key does not work. I sent in an email to support but I haven't received a reply. Sorry for nagging you, I realize you are probably all busy over there, but I'm super excited about this. Sublime Merge so far is the _perfect_ git client I have been waiting for.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by giancarlostoro on Thursday September 20, 2018 @04:59PM (#18035418)
My one question why was this made into it's own thing and not integrated into Sublime? I sort of would love to see Sublime have a bit more power, I can only assume it would start to consume too many resources? It'll be interesting to see what else you guys make. I really hope you consider making SublimeMail as others suggested.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by recursive on Thursday September 20, 2018 @05:25PM (#18035601)
Do one thing and do it well.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by yumaikas on Thursday September 20, 2018 @11:09AM (#18032981)
Where are the various options and the like documented?

I'd like to add a custom command for pulling a specified branch from a remote, and given the extensibility of Sublime Text, I think there's a way to do that, but I'm not yet sure how to find it all?

Also, count me as a vote for a high performance Sublime Terminal. I'd pay for that in a heartbeat.

Re:Show HN: Sublime Merge – A Git client from the makers of ... by throwaway427 on Thursday September 20, 2018 @10:25AM (#18032633)
Hi Jon,

One feature that's missing from most of the git clients I use is the ability to do "branch1...branch2" diffs, ie, diff two branches from a common starting point but only show the new changes in branch2. Do you think this will be possible in Sublime Merge at some point?

Re:Show HN: Sublime Merge – A Git client from the makers of ... by wbond on Thursday September 20, 2018 @11:05AM (#18032945)
If you select two commits in the commit list, it will diff between the two. Currently there isn't a super-easy way to jump to a branch while leaving the previous one selected, but we have some ideas on enhancing some of the process of jumping around the commit list.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by fizzledbits on Friday September 21, 2018 @02:27PM (#18041647)
Some feedback: I have a project containing a large (multiple MB) text file. Running Ubuntu 18.04. When there is a change to that file, Sublime Merge's UI becomes fairly unresponsive, with many actions taking multiple seconds to complete.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by mmjaa on Friday September 21, 2018 @05:11AM (#18038286)
Hi Jon - great work - I've been a happy registered user of ST for years and I find it a wonderful tool in my productivity kit - so thanks!

Will there be a home-brew cask for us on MacOS, by any chance?

Re:Show HN: Sublime Merge – A Git client from the makers of ... by nimeshneema on Friday September 21, 2018 @09:51AM (#18039662)
Re:Show HN: Sublime Merge – A Git client from the makers of ... by georgehaake on Thursday September 20, 2018 @10:07AM (#18032530)
Thank you for the new cool tool.

I'm hoping you could somewhat detail your custom UI toolkit used in these apps as they are consistently fast and uniform across platforms?

Re:Show HN: Sublime Merge – A Git client from the makers of ... by antaviana on Thursday September 20, 2018 @08:57AM (#18032002)
I notice that seats can be changed any time in a Business subscription. Is the end of subscription recalculated each time you add or remove a seat?
Re:Show HN: Sublime Merge – A Git client from the makers of ... by jskinner on Thursday September 20, 2018 @04:51PM (#18035354)
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.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by ryan-allen on Thursday September 20, 2018 @06:36AM (#18031171)
Hello fellow Sydney-sider! This looks amazing! If this is half as snappy as Sublime Text I reckon it'll be a winner! Good job Sublime Team! :)
Re:Show HN: Sublime Merge – A Git client from the makers of ... by micnil on Thursday September 20, 2018 @08:09AM (#18031656)
Great tool! Is it possible to get more than 3 lines of context in the diff view? Tried setting: git config diff.context 20 but this had no effect.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by jskinner on Thursday September 20, 2018 @08:13AM (#18031684)
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
Re:Show HN: Sublime Merge – A Git client from the makers of ... by micnil on Thursday September 20, 2018 @08:22AM (#18031748)
Oh I see, that's probably more in line with what I want to do most of the time. Thanks!
Re:Show HN: Sublime Merge – A Git client from the makers of ... by sscarduzio on Sunday September 23, 2018 @05:22AM (#18050227)
Hi Jon! Thanks so much for this. Works amazing! I really like the look and feel of Text and Merge. What UI libraries do you use?
Re:Show HN: Sublime Merge – A Git client from the makers of ... by iamgopal on Thursday September 20, 2018 @03:50PM (#18035014)
Any thoughts on open sourcing cross platform ui library that you have created ? Or even a paid version ?
Re:Show HN: Sublime Merge – A Git client from the makers of ... by davidcollantes on Thursday September 20, 2018 @02:16PM (#18034435)
Would you consider adding both products (Sublime Text and Merge) in a bundle, say, at a lesser price?
Re:Show HN: Sublime Merge – A Git client from the makers of ... by openbasic on Thursday September 20, 2018 @11:21AM (#18033092)
Do you guys use OpenGL to render the UI widgets? Or do you use something more high-level like Skia?
Re:Show HN: Sublime Merge – A Git client from the makers of ... by saagarjha on Thursday September 20, 2018 @12:54PM (#18033853)
Sublime Text uses Skia.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by openbasic on Thursday September 20, 2018 @03:38PM (#18034936)
Do you know if they tested alternatives, like Blend2D?

https://blend2d.com/

Re:Show HN: Sublime Merge – A Git client from the makers of ... by p0nce on Thursday September 20, 2018 @06:03AM (#18031033)
Thank you. I use Sublime every day, and will for the foreseeable future.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by sydd on Thursday September 20, 2018 @06:14AM (#18031086)
Looks great!

Is there any roadmap somewhere so we know what to expect in the future?

Re:Show HN: Sublime Merge – A Git client from the makers of ... by dsego on Thursday September 20, 2018 @06:42AM (#18031202)
I see you haven't used Sublime Text. No roadmap, sometimes a few years go by without any updates.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by cwhiteley on Thursday September 20, 2018 @04:45AM (#18030728)
Hi Jon, the app looks great. Does it currently support GitFlow?
Re:Show HN: Sublime Merge – A Git client from the makers of ... by zyang on Thursday September 20, 2018 @12:11PM (#18033521)
Is there a way to view history of a single branch?
Re:Show HN: Sublime Merge – A Git client from the makers of ... by marmaduke on Thursday September 20, 2018 @10:28AM (#18032656)
the light UI theme is great (as is the app itself), is there something similar available for ST?
Re:Show HN: Sublime Merge – A Git client from the makers of ... by wbond on Thursday September 20, 2018 @11:09AM (#18032986)
The light theme uses the Breakers color scheme from Sublime Text 3 for the editor controls. Many of the other colors are pulled from the Default theme in Sublime Text. This includes the colors of the commit list which is based on the side bar in ST, and the command palette.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by nkkollaw on Thursday September 20, 2018 @02:18PM (#18034449)
Why no love for hidpi monitors?
Re:Show HN: Sublime Merge – A Git client from the makers of ... by jskinner on Thursday September 20, 2018 @04:53PM (#18035361)
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)

Re:Show HN: Sublime Merge – A Git client from the makers of ... by nkkollaw on Thursday September 20, 2018 @07:30PM (#18036181)
It's not, but I'm using both GDK_SCALE and QT_SCALE in /etc/environment.