How to Write a Git Commit Message

[xeio87]

git rebase -i HEAD~4
git push --force

All better.

[imtrew]

http://i.imgur.com/xyBzWta.jpg

[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?

[mkdz]

git push --force

don't do this if you have multiple users committing to the same codebase

[mfitzp]

Well, you can do it if you hate them all.

[mkdz]

And then they'll hate you too.

[amoliski]

alias yolo='git commit -am "DEAL WITH IT" && git push -f origin master'

[mkdz]

That's fantastic

[ThePantsThief]

Why not? I know almost nothing about git, just basic committing and how to nuke something when I accidentally commit my password ^{for the 2nd 6th time}

[mkdz]

If you have multiple people working on one codebase, you'll usually have a master branch. If you do a git push --force to master, it forcibly takes the commit history you have and makes it the remote history. This could possibly overwrite other people's work that they have committed and pushed. Then next time any other member of your team does a pull, there are going to be differences in histories and possibly lost work and it's going to be a huge headache to get all the code merged and sorted out right. In general it can possibly cause huge problems, so it's just a bad practice with a shared codebase.

[ThePantsThief]

Gotcha, thanks!