Live data from Hacker News

Show HN: Sublime Merge – A Git client from the makers of Sublime Text

sublimemerge.com

131–140 of 362 posts

Re: Show HN: Sublime Merge – A Git client from the makers of Sublime Text

#131
post #51

Looks great Jon, happy you are expanding the Sublime family. Can I suggest Sublime Terminal as a possible addition? I'd happily pay for a decent terminal experience on Windows and with your cross platform toolkit it looks like you could deliver that. ConEmu et al just don't do it for me.

+1, windows is unusable without a good terminal - my current favorite is ConEmu but it comes with some quirks.

[deleted]

Re: Show HN: Sublime Merge – A Git client from the makers of Sublime Text

#132
post #91

Earlier quoted context omitted.

I would keep an eye out on alacritty. It's a blazingly fast gpu-accelerared terminal emulator for Unix (currently) written in rust. According to their 0.2.0 announcement post, where they added scrollback support, Windows is next on the Roadmap.

Thanks, I think I'd seen this one in the past but had ruled it out due to no Windows support (at the time). Edit: Ah, also "doesn't have features such as tabs" ruled it out for me.

You can get a tab-like experience using tmux. This also gives you features like scrollback which Alacritty doesn't support out of the box.

Re: Show HN: Sublime Merge – A Git client from the makers of Sublime Text

#133
post #2

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

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 Sublime Text

#134
post #2

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

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 Sublime Text

#136
post #2

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

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 Sublime Text

#137
post #133
post #2

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

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.

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 Sublime Text

#138
post #121
post #2

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

Any plans to switch from Gtk+ 2 to 3 on Linux? Scaling of native dialogs isn't very good with HiDPI displays atm :/

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 Sublime Text

#139

Earlier quoted context omitted.

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.

How do you squash commits?

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 Sublime Text

#140
post #133

Earlier quoted context omitted.

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.

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

Oh I see, that's probably more in line with what I want to do most of the time. Thanks!
Post reply on HN