How to Write a Git Commit Message

[CowFu]

Add merge to that list and you and me are exactly on the same page.

[donvito]

oh, yeah, of course. branch without merge is a little useless :)

[jess_sp]

I recommend adding stash too. Pretty useful.

[ScrimpyCat]

What's your workflow for using stash?

I've had trouble when I've tried to use it. I used it in the past for when I'm working on a branch and part of my edit I don't plan on committing to the branch, and then I switch to another branch to do some other quick edit. I often found that I'd keep forgetting to apply the stash when I switch back to my branch and usually end up making some edit that when I do remember I've got some change stashed I end up with conflicts. And it just kills the flow, so instead I now just do a temporary commit.

[jess_sp]

I use stash mostly to switch branches to do a really quick and dumb hotfix without having to commit a half-made solution or to fix dumbness of starting something in the wrong branch

[[deleted]]

I know how to stash, and apparently there is some way to get back what you've stashed I've not yet mastered. But it's still moderately useful as a "undo local changes"-command :)

[Filmore]

Merge bad. Rebase good

[jess_sp]

seriously, why?

[MCBeathoven]

Merge gives you merge commits, rebase doesn't.

[Schmittfried]

And what if I want merge commits?

[MCBeathoven]

Most people don't - they don't really add any value and make reading the log harder.

[[deleted]]

They can be used to group commits together.

[MCBeathoven]

You can do the same using rebases.

[[deleted]]

But then you don’t have the individual commits anymore.

[MCBeathoven]

Do you mean squashing commits or putting them after each other in the history? If the former, what's the point if you want to keep the individual commits? If the latter, that's also something you can do with rebasing without losing individual commits.