Question 1

How to write a good Git commit message?

Accepted Answer

Use imperative present tense for the summary under 50 chars, add a blank line, then a body wrapped to 72 chars explaining why and how. The guide provides examples like 'Mark huge records as obsolete' to illustrate this.

Question 2

Should I rebase or merge in Git?

Accepted Answer

Rebase personal branches onto main before merging to keep history linear, but never rewrite published history. For multi-commit branches, use --no-ff to create a merge commit, as detailed in the Merging section.

Question 3

Git style guide vs conventional commits: which should I use?

Accepted Answer

This guide covers broad best practices for branches, merges, and maintenance, while Conventional Commits focus on commit message formatting for automated tooling. Choose based on whether you need comprehensive guidelines or specific message standards.

Question 4

How to name Git branches for a team?

Accepted Answer

Use short, descriptive lowercase names with hyphens, and include ticket IDs if needed. For collaborative features, create personal branches under a team-wide branch like feature-a/maria, as explained in the Branches section.

Question 5

How to clean up Git repository history?

Accepted Answer

Use git rebase -i to squash or reorder commits before pushing, and periodically run git-gc and git-prune for maintenance. The guide warns against rewriting published history but allows tidying up unpublished branches.

Question 6

What's the best Git workflow for a small team?

Accepted Answer

The guide doesn't prescribe one, but suggests consistency is key. A simple feature branch workflow with regular merges to main often works well, as implied in the Merging section's advice on short-running branches.

Git Style Guide

What is Git Style Guide?

Overview

Use Cases

Best For

Related Projects

Found a gem we're missing?

Not Ideal For

Pros & Cons

Pros

Cons

Frequently Asked Questions