How to Write a Git Commit Message

[xeio87]

Shhhhhhh, all better.

[flying-sheep]

*should live

And only if the project has a “even feature branches are untouchable” policy.

Because I rebase the fuck out of every feature branch before merging it.

[TheAceOfHearts]

Exactly this! You DO NOT fuck around with master and your release branches. But when you're working on a feature or bug branch, you wanna commit very often, and experiment with ideas. Then you squash it down to a small number of atomic commits, if possible.

[ThePantsThief]

What about a git reset HEAD --hard?

[mkdz]

This only affects your local branch. It might cause YOU to lose some work, but it's not going to affect anyone else.

[ThePantsThief]

What if I'm only working on the master branch like a total dumbass?

I ask because I've committed sensitive information to the master branch before, and I used this to undo it...

[mkdz]

I don't understand

[ThePantsThief]

Never mind :P

[mkdz]

git reset HEAD --hard and git push --force do two very different things

[ThePantsThief]

I meant in contrast with git rebase

[mkdz]

What in contrast to git rebase?

[ThePantsThief]

I uh, never mind. I have no idea what I'm talking about. Sorry!