Oh Shit, Git?

Post by tom_ » Thu, Jan 16, 2025, 7:16 PM UTC

nomel wrote: post #14

PaulDavisThe1st wrote: post #11

Earlier quoted context omitted.

Possibly consider that "deleting a file from history" is rather far outside the norm or recommended practice for git (even though it is, of course, entirely possible)

> even though it is, of course, entirely possible I take the more realistic perspective: until git makes it impossible to commit something that shouldn't have been, like a secret, then deleting a file from history is a fundamental requirement of git.

Post by jazzyjackson » Thu, Jan 16, 2025, 7:19 PM UTC

antithesis-nl wrote: post #18

jazzyjackson wrote: post #15

Earlier quoted context omitted.

Bro, really, self-taught people with a bare minimum understanding of the tools they use are super normal, and when they get into a pit they have to fix it themselves. Although to your point folks would be better served carefully reading the docs / git book than googling a specific solution to their specific error code.

[flagged]

Post by PaulDavisThe1st » Thu, Jan 16, 2025, 7:28 PM UTC

antithesis-nl wrote: post #20

PaulDavisThe1st wrote: post #13

Earlier quoted context omitted.

I've been using git for at least 6 years now, maybe 10. Sites like this are a great aid to remembering how to deal with certain situations. And yes, I understand what the commands do, but that doesn't mean I always could, or always want to, put together the series of steps from scratch. And also, we self-host our own gitea hosting because we're not getting sucked down by yet another hosting debacle (old enough to hav…

> For git hosting just as much as everything else on line, if you're not paying for it, you're not the customer. Yeah, lovely trope, but I'm literally talking about organizations hosting their Git repos on a file share here.

Post by Retr0id » Thu, Jan 16, 2025, 7:33 PM UTC

Post by lalaithion » Thu, Jan 16, 2025, 7:36 PM UTC

pitaj wrote: post #3

Some changes I would make: 1. Always use `git switch` instead of `git checkout` 2. Avoid `reset --hard` at all costs. So for the "accidentally committed something to master that should have been on a brand new branch" issue, I would do this instead: # create a new branch from the current state of master git branch some-new-branch-name # switch to the previous commit git switch -d HEAD~ # overwrite master branch to th…

    # this command exists already;
    $ git switch -c some-new-branch-name
    # is there a command that simply moves a branch from one commit to another without changing anything else? It feels like it should be possible given how git works.
    $ git move-branch master HEAD~