I switched to Sublime Merge a few months ago an love its simplicity. Also, it can show you the actual Git commands executed, so it is useful for learning the Git command-line as well
I'm fine with git gui
and the command line for everything git because it's fast and immediate, but I like sublime text - they also made a gui for git called Sublime Merge
I can't say how good it is since I've never used it much, but Sublime Text sowed they are capable of delivering high quality GUI apps, so I'd give it a try.
Sublime Merge (from the maker of Sublime Text)
It’s about the best of the git tools I’ve tried. Yes, the cmd line is great, and I use that a lot too. But when I really want to ‘see’ what’s going on, Sublime Merge is my goto.
I use Sublime Merge for my day to day work. Advantages for me are:
And most importantly:
Not to mention I can have all of this with different tabs for each repository I might be working on.
Color schemes only control file views; if you want to modify the overall look of the application you need to create a Theme for that.
This is possible but is more involved than simply modifying a color scheme. I'm not aware of any publicly available alternate themes for Sublime Merge currently other than the ones it ships with.
The Official Documentation includes documentation on themes and how to create them; the process is very much like that used for Sublime Text (since they share the same code base to a large degree).
Altering the theme is (to my knowledge) not allowed at all without a license, although it may be possible to alter color schemes in the evaluation copy.
I like https://gitlab.com/. I find their issues/boards system is better than github's. Also the UI feels cleaner, and I got a free shirt from them :P
As for desktop git gui, I highly recommend https://www.sublimemerge.com/. I personally started with using just terminal, tried GitKraken and was overwhelmed, but Sublime Merge has been perfect. Has the features I need while providing a nice interface. So easy to see diffs and resolve merge conflicts.
You might like Kaleidoscope or Sublime Merge. As Nate says, things like "git diff --word-diff=color" can be useful, but then they'll only show the line once.
The download page very clearly says:
>Sublime Merge may be downloaded and evaluated for free, however a license must be purchased for continued use. There is currently no enforced time limit for the evaluation.
Many people also think that Sublime Text is free, but it also is not.
Yeah, Sublime Merge (NOT Sublimerge, that's a different project) is great!
I use git cli
98% of the time, once in a while though, I like a GUI to browse through changes and Sublime Merge is fantastic. It can do patch staging, by chunks or individual lines.
I'll look into it, thanks!
I'm still honestly curious about the above posters issue.
The primary issues I see with git on my team is failure to properly resolve conflicts when they occur on their branch or not learning how to pick from the local and override the remote or origin and vice versa.
I honestly believe the issue stems from some of them using VS Code extensions and not understanding what is happening (the small terminal window and above their code with various highlighting that's confusing to them).
It's usually easier to have them use a standalone git gui rather than using extensions for their editor, I'm not really a fan of any of the ones I've seen them use. They make it harder for a new person to understand what's happening.
I'm really happy with Sublime Merge and it's a good way to let members explore on their own (you can see what git commands run when clicking buttons).