• Ocelot
    link
    fedilink
    65
    edit-2
    1 year ago

    fuck it. rm -rf repository; git clone repository

    Been using git since almost as long as its been around, still can’t be bothered to learn to how to fix conflicts.

    • @marcos
      link
      171 year ago

      Rename it, so you can run diff on those surprising things that in no way could have changed, but are not equal to the repository. And then delete.

      Or keep the X-old; X-backup; X-bkp; X-old-old; X-old3 dirs.

  • @mvirts
    link
    English
    47
    edit-2
    1 year ago

    mv .git .git_old7

    git init

    git add .

    git commit -m “almost working”

  • @joyjoy
    link
    English
    141 year ago

    Neither remove untracked files sadly.

      • @[email protected]
        link
        fedilink
        141 year ago

        I think git clean is more appropriate. With git stash you create a stash which you then have to drop.

          • @[email protected]
            link
            fedilink
            11 year ago

            Of course you don’t have to, but if you don’t plan on ever using it then it’s just trash living in your git folder. If you do plan on using it again in the future, then it’s usually better to make it a branch so you can push it to a remote.

        • sickday
          link
          fedilink
          91 year ago

          Yea but you can always git pop if you need any of your stashed changes

          • Ocelot
            link
            fedilink
            71 year ago

            i chuckled at the thought of ‘git poop’ being a command. I’m going to alias that to something.

            • @PoastRotato
              link
              8
              edit-2
              1 year ago

              You could make it run git pop until it clears the whole stash

    • @[email protected]
      link
      fedilink
      English
      161 year ago

      git restore is a pretty new command AFAIK. Those of us who learned git before its existence have probably stuck to the old ways of git reset --hard.

  • @girltwink
    link
    English
    81 year ago

    alias mybad=‘git add -u && git commit --amend --no-edit && git push --force-with-lease’

    • @zexu
      link
      English
      21 year ago

      😂😂😂

  • Martin
    link
    fedilink
    21 year ago

    That is stupid. Those commands are for different use cases.