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!

  • koala@programming.dev
    link
    fedilink
    arrow-up
    1
    ·
    10 hours ago

    When I learned Git I think there were not decent tools, so I got used to the command line.

    I occasionally use gitk for reviewing my commits- it’s nicer to see the files modified and be able to jump back and forth, although I get I could use git log -p instead.

    I’m an Emacs user, but I don’t use magit (!)

    I like some of the graphical tools- some colleagues use Fork and I like it… but as I’ve already learned the CLI, I don’t see the point for me.

    I could use learning some jj because it automates some of the most tedious parts of my workflow, but I’m getting too old.

  • deadcatbounce@reddthat.com
    link
    fedilink
    arrow-up
    4
    ·
    edit-2
    1 day ago

    Off topic: day-after-day with these kinds of posts and especially the replies, I need Reddit less and less. That’s a very good thing.

    • TehPers@beehaw.org
      link
      fedilink
      English
      arrow-up
      1
      ·
      4 hours ago

      Sorry, guess the replies are too tame. Let me help you with that.

      Anything more than the git CLI is a joke. Real developers should know how to raw-dog that thing. If you’re not octopus merging your rebased branches to deploy to prod, you’re just not a real developer.

      (I use gitui)

    • AdamBomb@lemmy.sdf.org
      link
      fedilink
      English
      arrow-up
      4
      ·
      2 days ago

      Same, because its UX is actually really good. Years ago when I was new to git, I tried to use Sourcetree to revert a merge commit, and it would just fail. When I tried it in the CLI, it still failed, but it told me how to fix it. (I needed to specify which parent)

      That, plus it’s scriptable, plus I’m in the terminal a lot anyway. I’ll also use the IDE git client sometimes if that’s where I am at the moment.

    • SinTan1729@programming.dev
      link
      fedilink
      English
      arrow-up
      2
      ·
      edit-2
      2 days ago

      I mostly use git from the cli, but when I want to use a frontend, I use lazygit. (I just find it easier to use TUI for some things like only committing some of the changed files, squashing, or fixup commits.)

  • bignose@programming.dev
    link
    fedilink
    English
    arrow-up
    5
    ·
    2 days ago

    Magit is what allowed me to finally commit to switching to Git full time.

    It’s such an excellent front-end for Git that I’ve known numerous workmates learn Emacs just to use Magit.

  • Xuntari@programming.dev
    link
    fedilink
    arrow-up
    1
    ·
    2 days ago

    LazyGit and GitKraken. I try to use LazyGit as much as possible, but a few things are easier for me in GitKraken (as I’m more used to it).

  • spartanatreyu@programming.dev
    link
    fedilink
    arrow-up
    3
    ·
    edit-2
    2 days 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.

  • Tenkard@lemmy.ml
    link
    fedilink
    arrow-up
    1
    ·
    2 days ago

    Github desktop, despite the name it’s just a git client. Absolutely clownish that there’s no official Linux support (there’s a fork which works perfectly). I use it to interact with self-hosted gitea, codeberg and github, pretty happy with it, I’m Aldo testing git butler

  • lightnsfw@reddthat.com
    link
    fedilink
    arrow-up
    2
    ·
    2 days ago

    Is Vscode a git client?

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

  • somegeek@programming.dev
    link
    fedilink
    arrow-up
    3
    ·
    2 days ago

    Lazygit. Used gitui for a long while but lazygit has vim key bindings which is much nicer and it also seems much more stable.

  • Zarlin@lemmy.dbzer0.com
    link
    fedilink
    arrow-up
    4
    ·
    edit-2
    2 days 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.

    • Faalangst_26@feddit.nlOP
      link
      fedilink
      arrow-up
      2
      ·
      2 days 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