Does anyone know if there is a good difftool for sublime? I'm always launching meld for complicated diffs, would love it this or some other addon could do side by side diff
I like to use P4Merge, it's the best merger/differ for code on OS X. Not the prettiest, but the merge workflow is good.
SublimeGit: Full-featured Git integration for Sublime Text
61–70 of 88 posts
Re: SublimeGit: Full-featured Git integration for Sublime Text
#62I use this mainly for "Git: Diff Current File". It's much easier to see in Sublime than Terminal for me.
Re: SublimeGit: Full-featured Git integration for Sublime Text
#63Wow... So yeah, I made this. Woke up this morning to a slew of twitter mentions and quite a few orders. Thank you so much for the support! I'm about to get on a 14 hour international flight in a couple of hours, but i'll be happy to answer any questions. Also, i'm tweeting from @SublimeGit every once in a while.
It is great, however when doing a Git Status, the shortcuts are not compatible with VI-input mode since they are vi-commands (i,C etc), could you make it possible to use cmd+shortcut?
Re: SublimeGit: Full-featured Git integration for Sublime Text
#64Earlier quoted context omitted.
I've always found this plugin slow which is a shame. It's nice to visually see the changes made to a file.
If you are using ST3 you can use non blocking mode and GitGutter will run in a seperate thread. EDIT: Here is the section on the read me about it: https://github.com/jisaacks/GitGutter#non-blocking-mode
Re: SublimeGit: Full-featured Git integration for Sublime Text
#65Earlier quoted context omitted.
I hope that for 10€ most people will find it worth it. If you've already spent 60$ or more on Sublime Text and upgrades, I can see why this might seem weird. However, as the homepage says you can basically install it and use it for free as long as you like. You'll get a popup occasionally (if you do use it), but that's the only "restriction". Also, for a free alternative, I have to mention https://github.com/kemayo/s…
Looks like a great job, and good man for giving a shout out to the free alternative as well. As an existing user of Kemayo's plugin, what are the most compelling reasons for me to buy your version? An elevator pitch, if you will.
Also, I try my best to keep up with user requests, which leads to about 1-2 releases a month. While there are occasionally bugfixes going into kemayo's plugin, I'm not sure if it's receiving any significant development (not trying to call anyone out here, it's just my observation from occasionally looking at the repo).
Re: SublimeGit: Full-featured Git integration for Sublime Text
#66If you could add the ability to stage by line/hunk, perhaps from within the diff view, that would be pretty rad.
Also too bad that you can't initiate an interactive rebase using SublimeGit.
If I have to drop to the terminal for those two things (which I do quite frequently), realistically I'll end up just using the terminal for all git operations.
Re: SublimeGit: Full-featured Git integration for Sublime Text
#67Re: SublimeGit: Full-featured Git integration for Sublime Text
#68If you like this, you should check out http://wakatime.us which is a free time tracker for Sublime that works with Git to display how much time you work in each project and even in each branch.
If it's free, 'sign up for free' suggests otherwise. If there's a cost, please be up front about it. If you haven't decided what or whether to charge, just say so ;)
Re: SublimeGit: Full-featured Git integration for Sublime Text
#69Re: SublimeGit: Full-featured Git integration for Sublime Text
#70I could imagine diffing being a way better experience straight from the file you want to diff, and with code highlighting. That definitely sucks from the command line, but it's also pretty rarely needed.
Anything else?
The big disadvantage I see is that this is not going to be on anyone else's computer when I'm pairing or just messing around with them, so if I get accustomed to not using command-line interface then I get screwed when I'm not on my own computer...
Edit: the quick-commit feature looks pretty cool as a way to encourage making smaller commits, since I always forget to commit in smaller pieces.