• xmunk
          link
          fedilink
          arrow-up
          13
          ·
          1 year ago

          Nah, rebase -i, squash, fsck and reflog

          • Rikudou_Sage@lemmings.world
            link
            fedilink
            English
            arrow-up
            11
            ·
            edit-2
            1 year ago

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

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

            • xmunk
              link
              fedilink
              arrow-up
              11
              ·
              1 year 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)

              • overcast5348@lemmy.world
                link
                fedilink
                arrow-up
                3
                ·
                1 year 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.

          • Valmond@lemmy.mindoki.com
            link
            fedilink
            arrow-up
            5
            ·
            1 year 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)?

            • xmunk
              link
              fedilink
              arrow-up
              4
              ·
              1 year ago

              Fsck is File System Check - realistically you should never need to use it.

    • traches
      link
      fedilink
      English
      arrow-up
      53
      ·
      1 year 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.

      • popcar2@programming.dev
        link
        fedilink
        arrow-up
        10
        ·
        1 year 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.