I’m wondering if you use any (graphical) clients to manage your Git, and if so, what client you use.

I myself have to use git professionally across all 3 major OS-es, and I currently use Sourcetree on Windows and macOS, and the Git tools built-in into IntelliJ on Linux.

Have given MaGit a try, but just couldn’t get all the shortcuts to stick in my mind.

Interested to hear your experiences!

  • spartanatreyu@programming.dev
    0·
    1 year ago

    Fork !!!

    It’s hands down the best git client.

    It’s free as in: sublime text or winzip where they ask you once a month if you want to pay for it but you can just select: I’m still trying it out, and it gets out of your way.

    • It’s got a well designed tree graph like in GitKraken except it doesn’t lag
    • It’s interactive rebasing is as smooth as JJ / LazyGit, so you can edit/rename/reorder your commits except you don’t have to have to remember CLI flags since it has its own UI
    • It’s lets you commit individual lines by selecting them instead of adding/removing whole hunks like Sourcetree except it isn’t filled with paper cuts where a feature breaks in an annoying way for 2 years and you have to do extra steps to keep using it how you want.

    And one killer feature that I haven’t seen any other git clients handle: allowing me to stage only one side of the diff. As in: if I change a line (so it shows up as one removed line and one new line in git), I can decide to add the new line change while still keeping the old line.

    So changing this:

    doThing(1);

    into this:

    doThing(2);

    Shows up in git as:

    - doThing(1);
+ doThing(2);

    But if I still want to keep doThing(1);, I don’t have to go back into my code to retype doThing(1);, or do any manual copy-pasting. I can just highlight and add only doThing(2); to the staging area and discard the change to doThing(1);.

    So now the code exists as:

    doThing(1);
doThing(2);

    Now with a one-liner example like this, we could always re-enter the code again. But for larger code changes? It’s far easier to just highlight the code in the diff and say: yes to this and no to the other stuff.

    And when you get used to it, it makes it really easy to split what would be large git commits into smaller related changes keeping your git history clean and easy to understand.

    • Guttural@jlai.luFrançais
      0·
      1 year ago

      In case you’re interested, git add <files> -p allows you to do this on the command line. I use it daily.

    • ILikeTraaaains@lemmy.world
      0·
      1 year ago

      I love Fork, bought the license to support the developer.

      The only thing I don’t like is that there is no Linux version, asked the dev and he told me that the issue with Linux is that there are different distros with different GUI libraries so it would require multiple versions for Linux.

      A bit saddened it I completely understand.

      • spartanatreyu@programming.dev
        0·
        1 year ago

        I paid for it too!

        It’s the first piece of shareware I actually went out of my way to pay for because it was so good that I’d be genuinely pissed off if it died. I’d probably end up switching to pijul or something else for my projects if it ever did.

        I’ve seen a bunch of people messing the windows version running in linux in the fork forums, so it may be coming in an unsupported capacity.

    • fox2263@lemmy.worldEnglish
      0·
      1 year ago

      I’ll second Fork, it’s been my go to for years! Maybe I’ll pay for it one day

  • HaraldvonBlauzahn@feddit.org
    0·
    1 year ago

    I used a lot of Magit at work (it’s good), as well as jujutsu and command line. Also, gitk for browsing history.

    Currently I use jujutsu at home for leisure stuff and command line + git gui at work. For some workplaces, more powerful tools are just overkill.

  • Kissaki@programming.devEnglish
    0·
    1 year ago

    TortoiseGit.

    Through settings, I move the Show Log to the top context menu level, and it’s my entry point to every Git operation.

    I see a history tree to see and immediately understand commit and branch relationships and states. I can commit, show changes, diff, rebase interactive or not, push, fetch, switch, create branches and tags, squash and split commits, commit chunk-wise through “restet after commit”, … And everything from a repo overview.

    • Creat@discuss.tchncs.de
      0·
      1 year ago

      I have a love-hate relationship with it. Due to work reasons I’m more familiar than I want to be with tortoiseSVN, and the git version is similar enough to feel at home. But that’s also it’s biggest downfall: it does a lot of things the “SVN way” despite being a git client. The workflow can be kinda made to work, but it always feels like it’s not a native git tool, because it isn’t. I would go so far as to say that it encouragedrl bad habits on git, especially for those used to tortoiseSVN.

  • Zarlin@lemmy.dbzer0.com
    0·
    1 year ago

    Fork on windows, SourceGit on Linux, both have a similar UI layout to SourceTree, but are much faster/snappier.

    I really like having a clear overview of the commit history, branches and current local state. I haven’t figured out yet how to get such an “at a glance” overview in the CLI.

    For advanced stuff the CLI is still very convenient.

    • cnovel@jlai.lu
      0·
      1 year ago

      I second Fork, been using it for years and it’s fast, able to handle multiple actions at once. Can’t recommend it enough!

    • mesa@piefed.socialEnglish
      0·
      1 year ago

      I second sourcegit. When I need to I’ll drop into the clu. But it’s so much easier to just look at the branches in sourcegit.

      It’s like an open source gitkracken.

    • Faalangst_26@feddit.nlOP
      0·
      1 year ago

      Have to take a look at Fork (annoying name to Google I image). Sourcetree can be quite sluggish and downright annoying on macOS.

      Ditto on the CLI having its pro’s and cons

  • setsubyou@lemmy.world
    0·
    1 year ago

    I mostly use the cli, but also Sublime Merge. It makes some things really convenient (like committing only some lines in a changed file), and looking at diffs is snappy too.

    • tribut@infosec.pub
      0·
      1 year ago

      Just fyi, you can add only a few lines of a changed file on the cli too using git add -p

  • lightnsfw@reddthat.com
    0·
    1 year ago

    Is Vscode a git client?

    No one take from me though idk what I’m doing when it comes to programming stuff.

  • oantolin@discuss.online
    0·
    1 year ago

    I’m an Emacs users, so unsurprisingly I use magit, but perhaps surprisingly I use it sparingly, using Emacs’s VC most of the time.

  • catalyst@lemmy.world
    0·
    1 year ago

    CLI for me. I do use the GitLens plugin in vs code but only so I can see commit info inline. I never commit anything from vs code.

    I like Kaleidoscope (v3) for diffs but not for merging. I could probably use any graphical difftool for this purpose but it’s what I’m used to.

    • Deebster@infosec.pub
      0·
      1 year ago

      This is very satisfying to use and is a nice companion to the command line - I particularly use it to stage only certain lines and files from the changes.

      I tried lazygit first, but there was a consistent lag that was probably only ¼ second but it ruined the experience for me.