Hacker News Board Hacker News, browsed like a classic message board
Live data from Hacker News

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

sublimemerge.com

Post reply on HN
Print view View original

111–120 of 362 posts

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

#111

Post by the_clarence »

jskinner wrote: post #84
the_clarence wrote: post #71

Earlier quoted context omitted.

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

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.

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

#112

Post by the_clarence »

porker wrote: post #94
jskinner wrote: post #84

Earlier quoted context omitted.

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.

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.

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

#114

Post by chrisper »

I can't figure out how to configure SSH key or where to find a documentation for the settings file :(

EDIT: Ok I found out it just takes the SSH key from ~/.ssh

But now it complains about C:\\Program Files\\Sublime Merge \\ssh-askpass-sublime.exe missing.

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

#115

Post by owaislone »

jskinner wrote: 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

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

#116

Post by adamlett »

klageveen wrote: post #45
adamlett wrote: post #36

For me the one and only GUI for Git, is GitUp: https://gitup.co .

GitUp is cool, I particularly love the graph view. It has almost no functionality though. You can't three-way-merge and resolve conflicts in it, nor browse the file tree for any given commit, nor compare any two commits.

True, it doesn't do everything, but it really hits the sweet spot for me. I wouldn't say that it almost has no functionality. To me, it has surprisingly much. It's just that it does such a good job of keeping the interface clean, that it can appear as if it doesn't do much.

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

#117

Post by robin_reala »

manmal wrote: post #35

For my needs, GitX (rowanj fork) is still unbeat: http://rowanj.github.io/gitx/ It has the exact right amount of UI complementing the command line, and some delightful features, e.g. amending the last commit is possible via a checkbox below the commit message. What I don't like about Sublime and now Sublime Merge, is the unusual way of setting preferences by editing files. I understand that hacking in a JSON file has…

For what it’s worth, the currently developed version of GitX (which I use daily) is at https://github.com/gitx/gitx . You’ll have to build it yourself, but it’s in a much better shape than the rowanj fork.

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

#118

Post by hannasanarion »

olalonde wrote: post #66
neslinesli93 wrote: post #52

Earlier quoted context omitted.

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?

> Do you have a plan to add git flow integration? What does that mean? Isn't git flow just a branching model?

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

#119

Post by jskinner »

owaislone wrote: post #113

Doesn't scale on HiDPI on Linux. Increasing font size only makes a part of the app readable and there is no zoom in/zoom out functionality that I could find. :(

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.

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

#120

Post by maxymoos »

owaislone wrote: post #115
jskinner wrote: 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

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?

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.

Post reply on HN