• Rikudou_SageEnglish
            11•7 months ago

            Must be an interesting work if you never add, commit or push.

            Edit: How the hell did you get the repo without clone?

            • @[email protected]
              11•7 months ago

              Pshaw, real programmers write out the contents of .git by hand.

              (Also, it was a joke, the last two commands I listed are ones you’ll ideally never need in your life)

              • @[email protected]
                3•6 months ago

                I was scared of reflog too. Had to use it for the first time recently after I accidentally’d a branch that I hadn’t pushed to remote yet. I was so glad that I could recover it all in <5 commands.

          • @[email protected]
            5•7 months ago

            reflog saved my life once after a stupid misshap.

            All rebase are belong to us (onto, rebase, and ofc interactive) but what’s fsck (I don’t squash personally)?

    • @[email protected]English
      53•7 months ago

      Title text: If that doesn’t fix it, git.txt contains the phone number of a friend of mine who understands git. Just wait through a few minutes of ‘It’s really pretty simple, just think of branches as…’ and eventually you’ll learn the commands that will fix everything.

      • @[email protected]
        10•7 months ago

        • git pull

        • git add *

        • git commit -m “Some stuff”

        • git push

        And occasionally when you mess up

        • git reflog

        • git reset HEAD@{n} (where n is where you wanna roll back to)

        And occasionally if you mess up so hard you give up

        • git reset --hard origin/main

        And there you go. You are now a master at using git. Try not to mess up.

    • @[email protected]
      2•7 months ago

      I was looking for this comment. PHP storm and git are like best friends. I very very rarely need to resort to the CLI and generally that’s for hard resetting after I screw something up

    • @[email protected]
      -5•7 months ago

      Good luck doing anything remotely complicated/useful in git with an IDE. You get a small fraction of what git can do with a tool that allows absolutely 0 scripting and automation.

      • @[email protected]
        14•7 months ago

        IDE git is less powerful than CLI git. However I’m pretty confident that most people use more features of git by using a GUI.

        CLI feature discoverability is pretty awful, you have to go out of your way and type git help to learn new commands.

        With a GUI though, all the buttons are there, you just have to click a new button that you’ve been seeing for a while and the GUI will guide you how to use it.

      • @[email protected]
        9•7 months ago

        It sounds like you don’t speak from experience. I have all the automation I need. It supports git hooks on top of IDE-only features like code checking.

        If I have to fire up my CLI for some mass history rewriting (like changing an author for every commit), or when the repo breaks - so be it. But by not using the CLI I save my fingers and sanity, because committing a bunch of files is several click away with little to no room for error.

        I can rebase, patch, drop, rename, merge, revert, cherry pick, and solve conflicts with a click of a button rather than remembering all the commands and whatnot.

      • @[email protected]English
        3•7 months ago

        I use the cli, but my main goal is to never have to do anything remotely complicated with git. Does it happen sometimes? Of course.

  • arthurpizzaEnglish
    29•7 months ago

    Learning git will give you the tools to work on projects on any git platform. It doesn’t matter if I’m in Forgejo, Gitlab, or Github.

  • @[email protected]English
    28•7 months ago

    CLI
    Though I will admit it took me a while to get there
    git add -i is where the true magic begins

  • @[email protected]
    23•7 months ago

    GitHub desktop Stan here. Been a software engineer for over a decade and still love my UI tools. GitHub desktop is good enough 99% of the time.

    • Aatube
      12•7 months ago

      Any windows screenshots?

      (Fork is also an awful name in terms of searching for it btw)

      • @[email protected]
        3•7 months ago

        I wish! The best Linux git gui I have found is SmartGit. I like it, but it’s just a little goofy and not free. Fork is better for its ability to very easily stage and/or stash a subset of the current changeset.

        Anyone got any suggestions? I tried git-cola and gitkraken. The former I found obtuse and limited, and the latter is not free in addition to somehow making git harder with a pretty gui.

        • Aatube
          3•7 months ago

          Gitkraken is free as long as the repository is public, which seems like an alright compromise to me. The only problem I had with it was that it was electron. What did it make harder for you?

        • @[email protected]English
          2•7 months ago

          The best ones I have found for Linux are SmartGit and Sublime Merge, but neither are free in any sense. Sublime Merge is slightly cheaper. SmartGit offers a free “hobby license” but it limits which kinds of repos you can work with.

          Gitkraken looks like it might be good but I haven’t used it.

      • katy ✨
        3•7 months ago

        sadly no and i don’t think it works through wine

        but technically they have a mac client which is basically an expensive version of linux

    • @[email protected]
      3•7 months ago

      I hate coding on Windows, maybe I’ll check that out. (My only option is Windows for my work laptop because I need to use a few Windows-only softwares and IT says I’m not allowed to dual boot)

      • 🐍🩶🐢
        English
        3•7 months ago

        Is running Linux off a USB drive possible? It isn’t ideal, but you can still have persistence if needed? There is also WSL, if you don’t need a GUI.

        • @[email protected]
          1•7 months ago

          After the last windows update WSL gives me a BSoD every time 😭 Pretty sure IT wouldn’t appreciate me running Ubuntu off a USB drive but that’s a good idea.

  • @[email protected]
    16•7 months ago

    I’d love to like the desktop app, but I just don’t understand what it’s doing under the hood when I click a button. When I click an icon, is it syncing my changes up as it pulls down, it just pulling down? I guess point and click is more scary to me when prod is on the line.

        • @[email protected]
          2•7 months ago

          Prod being on the line meant “I’m on main”.

          Yeah, I set up branch protection, but I hate the fact that some UIs are all “I know you just want to pull, but let’s push while we’re at it”.

    • KubeRoot
      3•7 months ago

      If I may shill for a moment, that’s something I like about sublime merge - the buttons mostly map to git commands, and it has a nice log showing the commands it ran and their output.

    • @[email protected]
      4•7 months ago

      Freaking love TUIs, it’s like they took the convenience of a GUI and the efficiency of the CLI and merged them. As a Neovim and Lazygit user myself it’s amazing what I can accomplish in but a few keypresses.

    • @[email protected]
      1•7 months ago

      This is what I currently use, although I don’t really like the branch name color in last few versions, so kinda keep using the old version

    • @[email protected]English
      1•7 months ago

      I think for most people it’s whatever you got used to first. I agree the hatred the GUIs get is overblown. I would always recommend people learn the command line but if you want to use a GUI, go for it, doesn’t affect me unless your commits are bad, in which case the CLI wouldn’t have helped anyway.