I've used https://www.sublimemerge.com and https://www.sourcetreeapp.com but I think i prefer to just use my terminal most of the time...
Programming
All things programming and coding related. Subcommunity of Technology.
This community's icon was made by Aaron Schneider, under the CC-BY-NC-SA 4.0 license.
I've been using the git gui extension for a while and resolve conflicts in vs code. I also just use a lot of cli
Would it work for you if you created git aliases for commands you can't remember?
I use github desktop since I'm not using git a lot, and that gui is very easy to understand
Same here. My git needs are basic.
Github desktop is the only way I know how to clone my private repo. I do not understand how to clone my private repos through CLI.
I use GitHub Desktop - offered by GitHub themself. Its a GUI application where you can fetch, push, pull etc. But mostly just basic github "commands".
I generally don't trust most git GUIs - a number of our developers have used SourceTree on OS X before and it's led to nothing but issues. The only one I trust is the one built into IntelliJ IDEA, otherwise I'll use commandline.
I am pretty hooked to SmartGit. I absolutely love their branch and commit view and haven't found another tool that visualizes the tree quite as good (for my taste; I assume it has to do with familiarization over time).
I did however buy a lifetime license when they still offered them. Their current pricing model would have probably turned me off before I even got hooked. It is absolutely worth a look though.
I use GitKraken. It has a beautiful interface. It's free to use non-commercially but I pay $50/yr so that it can connect to my companies Enterprise account. I know I'm weak with git (I get the concepts but I'm a visual person) so the money is worth it to me.
Tig is a pretty nice terminal gui
Mostly using CLI but occasionally I use https://www.sourcetreeapp.com for graphical branching and stuff.
Git extensions, have been using it for years, and while the UI is not flashy, it gets the job done really really well.
- 45% SourceTree
- 45% CLI
- 10% TortoiseGit
The repository I work in is huge, old, and the folder structures are wide and deep. It is normal to modify tens of files in almost as many folders for a single feature change.
SourceTree for managing staged files and committing.
CLI for pull, branch switching, and searching.
TortoiseGit for showing the log or blame of individual files and folders.
I use GitKraken, which is pretty great, but for a lot of day to day stuff I just end up using the CLI
While I do most actions with the git
command or the git fugitive plugin from tpope, I will sometimes whip out lazygit
for certain things I don’t do that often.
I raise that by a "I wouldn't know how to survive half a day without lazygit". From my experience only maggit is in the same level - I just don't use emacs.
I mostly use CLI but sometimes SourceTree, it's neat
JetBrains have some quite extensive VC tooling built into their IDEs which I use almost exclusively. I used to do everything in the terminal, but I find it so much quicker and simpler to do it directly in the IDE.
Not really but sometimes if I need a visualization of something complicated that I can't see in my head I'll go to the network tab under insights in github
If you're already comfortable working in the shell, you should check out tig. It's not as fully featured as the other clients named here, but it's an excellent viewer nevertheless.
My office blocks git through the CLI/VS Code Tools but somehow GitHub desktop works. No idea why.
Sourcetree
I use the default git extension in vscodium. I usually code in vscodium anyway, so I just use it to commit my changes.
I think it is a better experience, you don't forget to add file when commiting changes, it is very easy to just commit couple files (instead of typing their name, just click the plus button), and writing multiline commit message is very easy.
I am one of the few Linux user that prefer not to use commandline when there is a graphical alternative.
I use Git Tower and I love it. I'm surprised I don't see it mentioned here.
I kinda do both? For some reason, I prefer the CLI when I clone a repo, but Sourcetree for committing, pulling, and pushing, and my IDE's built in git tools for merges.
I mainly program in Visual Studio so I use it's integration for simple commits, diffs, and checkouts. Anything more complicated than that I head for the command line.
If I need a visualisation, then gitk
is there for me.
If you can't remember commands, then get yourself a cheat-sheet.