Appearance
Git branch lifecycle — quick reference
Naming convention
| Pattern | Example |
|---|---|
feature/<id>-<slug> | feature/1428-add-metrics |
fix/<id>-<slug> | fix/1431-null-ptr |
hotfix/<id>-<slug> | hotfix/1433-cert-expiry |
release/v<major>.<minor> | release/v2.4 |
chore/<slug> | chore/bump-deps |
docs/<slug> | docs/api-guide |
Lifecycle
CREATE -> ACTIVE -> MERGED -> DELETE
-> STALE -> ARCHIVE_TAG -> DELETECommands
bash
# Create branch from clean main
git checkout main && git pull --ff-only
git checkout -b feature/1428-add-metrics
# List stale branches (30 days)
git for-each-ref --format='%(refname:short) %(committerdate:unix)' refs/heads/ \
| awk -v cutoff=$(date -d '30 days ago' +%s) '$2 < cutoff {print $1, strftime("%F", $2)}'
# Archive a branch before deletion
git tag archive/<branch>-$(date +%Y%m%d) origin/<branch>
git push origin archive/<branch>-*
git push origin --delete <branch>
# Recover an archived branch
git checkout -b <branch> archive/<branch>-<date>
# Delete merged local branches (exclude permanent)
git branch --merged origin/main | grep -vE '^(\*| main| develop)' | xargs -r git branch -d
# Delete merged remote branches
git branch -r --merged origin/main | sed 's/origin\///' \
| grep -vE '^(main|develop)' | xargs -r -I{} git push origin --delete {}
# Prune stale remote-tracking refs
git remote prune origin
git fetch -p && git branch -vv | grep ': gone]' | awk '{print $1}' | xargs git branch -dCI workflows
yaml
# Branch type detection
BRANCH_TYPE=$(echo "${GITHUB_REF#refs/heads/}" | cut -d/ -f1)
case "$BRANCH_TYPE" in
docs) CI_SCOPE=docs ;;
chore) CI_SCOPE=lint ;;
*) CI_SCOPE=full ;;
esacConfig
bash
# Pre-receive hook — enforce naming convention
git config --system hooks.allownonfastforward false # server-sideRecovery
bash
# Get back a deleted branch from its archive tag
git fetch origin
git checkout -b feature/restored archive/feature/old-branch-20260401