That aside, I'm about to try it out. Looking forward to a less CPU intensive git client than Sourcetree. So tired of the constant flickering of the unstaged files view in Sourcetree.
Show HN: Sublime Merge – A Git client from the makers of Sublime Text
321–330 of 362 posts
Re: Show HN: Sublime Merge – A Git client from the makers of Sublime Text
#322@jskinner can we run the 3-way merge tool from command line, i.e to set it as a `git mergetool` ?
Re: Show HN: Sublime Merge – A Git client from the makers of Sublime Text
#323Earlier quoted context omitted.
Why no love for hidpi monitors?
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 Sublime Text
#324Hi 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
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 Sublime Text
#325I use SourceTree almost solely for its "Split View Staging" feature, where a line or hunk can be moved between the two states and the entire bit you're about to commit can be viewed independently of other working copy changes. Fits my mental model so well , but is apparently considered too complicated for most other git clients such as GitHub Desktop and Tower. From the animation, Sublime Merge seems to have Staged/U…
I've been pretty happy with SourceTree, despite a few minor annoyances. What missing features are you thinking of?
Re: Show HN: Sublime Merge – A Git client from the makers of Sublime Text
#326Earlier quoted context omitted.
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?
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.
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 Sublime Text
#327Feedback: - I would be nice to be able to remove the name inside the commit log. It's only me on this project and literally 50% of the lines (ever other) is my name. - I would also like to have the option to split top/bottom like sourcetree, so that I can read the full commit message easier. - The 'end of list' looks like a loading indicator - 'Staging lines' only appear when I select something on the line (even one…
I can only get "Stage lines" for files I previously commited. Maybe I'm doing something wrong but if I add a new file the only options are Delete or Stage. Or maybe it isn't implemented yet.
Re: Show HN: Sublime Merge – A Git client from the makers of Sublime Text
#328- When I stage my lines, it is not obvious where the actual staging is as it just seems to disappear. In SourceTree there is a very clear 'split view' between the change and staged files.
Re: Show HN: Sublime Merge – A Git client from the makers of Sublime Text
#329Hi 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
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 Sublime Text
#330Earlier quoted context omitted.
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 s…
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