postscarce,

I use GitHub Desktop for 95% of my git needs, terminal for the other 5%

ezekiel,

Sublime Merge has been wonderful to work with

biscotty,

+1 for Sublime merge. I use it to resolve conflicts because I appreciate a gui for that and cli for everything else.

flash0flight,

Definitely can recommend Sublime Merge as well!

yanni,

I also love how fast Sublime Merge is. The built in merge tool is great too. I'm a sucker for apps with a command palette for easy access to every command.

Parsnip8904,
@Parsnip8904@beehaw.org avatar

It is one of the few tools that doesn't misrepresent the core git paradigm.

cosima_takeyama,

I haven’t found anything better than Sublime Merge when it comes to replacing git’s interactive staging (git add —patch) with a more friendly UX. The closest thing would be IntelliJ’s change sets feature but, in my experience, it’s much less useful because it still hunks lines near each other. In Sublime you have line by line selection to stage stuff.

It helps a lot when reorganizing commits at review time and before doing a merge.

Kissaki,

I use TortoiseGit.

The log window gives me overview and almost every action I need. Committing, diffing, switching, rebasing, creating and deleting branches and tags, pushing, fetching, merging, view logs of files, blaming, filtering…

The log view is still much better than the VS Git log view. And due to it's visual GUI it's much better than CLI when going beyond just one branch or a low number of my own branches.

qevlarr,

SourceTree when I was still a software engineer.

I'm a manager now, and I see people insisting on command line who have no idea what they're doing. Then don't! I think it's an awful attitude that real programmers use git command line, and GUIs are for babies. Please call out this attitude whenever you see it. Use tools that work for you. Git has a terrible user experience, let's face it.

shaggy,

I use SourceTree regularly, but when shit hits the fan, I always fall back to the terminal.

Nebula0578,

I'm a big fan of LazyGit + [delta]https://github.com/dandavison/delta() as the diff tool.

davehtaylor,

I have some git blame extention in VSCode, but otherwise no. Something about using gui tool for git makes me feel so disconnected from it, like I'm not entirely sure what's going on, and afraid I'm going to fuck something up

Also, I forget commands all the time. Mostly ones I don't use often, like changing/adding/removing remotes, changing settings, etc.

cityboundforest,
@cityboundforest@beehaw.org avatar

Since I work in Linux and primarily code in languages like C and C++ (i.e. compiled langs), I work completely in the terminal, so I don't use any GUI. It's nice and I'm already there for my compiling so I might as well use it for git.

However, re remembering all the commands, there is a nifty website I found a while ago and bookmarked called Git Explorer where you basically choose from dropdowns of what you want to do and it gives you the command(s) for it.

thepaperpilot,

I use sublime merge because I really like ST and want to further support the dev. I wish it had more integrations with github (and theoretically github alternatives), but I understand the reasoning not to. Before SM came out I just used the command line exclusively.

pkulak,

I never use Sublime Text, but I love Sublime Merge. I dunno why. Something about the UI just works for my brain, and the merge UI is amazing. I only ever open it with smerge . in a directory, and it's set to floating in my window manager so it pops up, I do my thing, and it goes away.

hunte,

Since I use Emacs I've been really happy with Magit, even tho it's UI has a bit of a learning curve to it. I've been also trying out Gitg since I moved back to GNOME and it's been really solid as well. It lacks a couple really nieche features but otherwise as a fast commit tracking/writing tool it's very good.

Da_Boom,
@Da_Boom@iusearchlinux.fyi avatar

I don't use a GUI, with the exception of Meld as my primary difftool

At work I wish they were using git. But we got SVN. How I long for the ability to use pull requests. But tortoiseSVN has some nice features (I'm stuck with windows over there) even if it's lacking in overall functionality.

ChrissieWF,

Developing in a Windows environment, I generally prefer Git Extensions.
It doesn't distract the eye with unneeded fancy and is very close to a command line git experience but still allows me a better visual sense of the repository and branches.

Unimeron,

KDE has a relatively new git tool named Kommit: https://apps.kde.org/de/kommit

ngons,

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...

  • All
  • Subscribed
  • Moderated
  • Favorites
  • programming@beehaw.org
  • kavyap
  • thenastyranch
  • tester
  • DreamBathrooms
  • mdbf
  • magazineikmin
  • tacticalgear
  • Youngstown
  • ethstaker
  • osvaldo12
  • slotface
  • everett
  • rosin
  • khanakhh
  • megavids
  • ngwrru68w68
  • Leos
  • modclub
  • cubers
  • cisconetworking
  • Durango
  • InstantRegret
  • GTA5RPClips
  • provamag3
  • normalnudes
  • anitta
  • JUstTest
  • lostlight
  • All magazines