I was looking at video reviews of git GUI clients. The best ones are pricey and we are two people occasionally editing some webpages for our business website. It’s hosted on GitLab Pages.

Can anyone recommend something straightforward? I’ll be sticking to the terminal but my colleague is new to code repositories.

Git GUI is free, but looks terrible IMO. Sublime have a nice one and it’s not subscription based, but is expensive. We are both on Mac usually.

Another alternative I considered was showing them the three terminal commands I use mainly (add, commit and push) and then let them edit from the file manager itself. But because they’ll be doing this so rarely, it might be easy to forget.

Edit: I’ve settled on a few to try out: sourcetree, fork, gitup and the one by Sublime. The conversation doesn’t have to end there, but thanks for the help. So many great answers here :)

  • SokathHisEyesOpen@lemmy.ml
    link
    fedilink
    arrow-up
    6
    ·
    edit-2
    1 year ago

    Sourcetree is pretty good. GitHub Desktop is cross-platform and pretty good. Visual Studio Code has a GUI for git management and it’s pretty good too. The last two are free, but idk about Sourcetree.

  • hoover900@sh.itjust.works
    link
    fedilink
    arrow-up
    5
    ·
    1 year ago

    for GUI I’m a fan of VS Code with the Git Graph extension. a not so much GUI solution would be setting up Starship. it gives the user visual feedback on what branch and if there changes to the repo along with a bunch of other fun stuff. since you’re on MacOS it’s super easy to install with Homebrew

  • HarkMahlberg@kbin.social
    link
    fedilink
    arrow-up
    4
    ·
    edit-2
    1 year ago

    I know OP is on Mac, but for anyone needing a git GUI on Windows, TortoiseGit is probably the best you’ll find. Integrates right into File Explorer, turns nearly every command into a form, every flag and parameter into a field, and it even shows you the command you end up running. Very powerful, and doesn’t do anything non-standard (looking at you Github). It’s actually taught me more about git than just reading the manual ever did.

    • FarraigePlaisteach@kbin.socialOP
      link
      fedilink
      arrow-up
      1
      ·
      1 year ago

      This was reviewed in the video I linked in another comment. Looking at their website though, at that link you share, it looks really suitable for beginners. Thank you, I appreciate the link.

  • sorrybookbroke@sh.itjust.works
    link
    fedilink
    arrow-up
    4
    ·
    1 year ago

    Not gui, but tui, lazygit is my favourite. It’s got all the features you could need, help with ?, and doesn’t limit stashes like github desktop for litterally no reason. If that doesn’t work for you have you tried github desktop?

    • corytheboyd@kbin.social
      link
      fedilink
      arrow-up
      2
      ·
      edit-2
      1 year ago

      lazygit is by far the best git ui imo. you have to give a shit to learn how to use it correctly (same goes for any tool), but the developer has made fantastic demo videos explaining the features. He has clearly used git professionally for a long time, and built something to solve the exact real-world git problems.

      I guess I wouldn’t give lazygit to someone with no git experience… I would set up some branch protection rules asap so they can’t use a ui to force reset a main branch or something.

    • FarraigePlaisteach@kbin.socialOP
      link
      fedilink
      arrow-up
      1
      ·
      1 year ago

      LazyGit is something that I’ll definitely test out for my own use, thank you so much!. I’ll see what they think of it too.

      I’ve looked at a video comparison which included GitHub Desktop and it seemed unintuitive to me. https://yewtu.be/watch?v=4cX4HeN6lH8

      But it was compared against top-tier clients like Git Kraken so maybe it’s better than the impression I was left with. Actually, I think I’ll test it out too and show it to them along with LazyGit and Fork. Thanks again.

  • jeeva@lemmy.world
    link
    fedilink
    arrow-up
    3
    ·
    1 year ago

    Other than the subscription model, I’m a huge fan of GitKraken (and the vscode extension, GitLens).

  • yamdwich@kbin.social
    link
    fedilink
    arrow-up
    3
    ·
    edit-2
    1 year ago

    Sublime Merge is what I use at work and is the only Git GUI I’ve had good luck with. It’s not free but well worth the 50 bucks, or you can use it with the nag screen indefinitely like Sublime Text.

    • FarraigePlaisteach@kbin.socialOP
      link
      fedilink
      arrow-up
      3
      ·
      edit-2
      1 year ago

      Oh, I didn’t realise you could use it with the nag screen! Considering it will be used no more than once per month I think we can handle that :) Thanks, that settles it.

    • Chrissie
      link
      fedilink
      arrow-up
      1
      ·
      1 year ago

      Can really recommend that as well!
      It’s fairly close to the CLI in a way, unless you turn it off you even see the console in/output in a window during/after each action. To anyone that usually prefers CLI git, have a look - it’s really nice to see the visualisation of the branches in the timeline.

      You can define your preferred Merge/Difftools, I really like TurtoiseMerge so that’s what I’m rolling with. For a bunch of merge tools it simplifies the config: