Git workflows and branching strategies for teams

#!/bin/bash
# Git workflow commands and patterns

# === GitHub Flow ===

# 1. Create feature branch from main
git checkout main
git pull origin main
git checkout -b feature/add-user-auth

# 2. Make commits (conventional commits)
git add -A
git commit -m "feat(auth): add JWT authentication middleware"
git commit -m "feat(auth): add login and registration endpoints"
git commit -m "test(auth): add unit tests for auth middleware"
git commit -m "docs(auth): update API documentation"

# 3. Push and create PR
git push -u origin feature/add-user-auth
# Then create PR on GitHub/GitLab

# 4. After review, merge (squash on GitHub)
git checkout main
git pull origin main
git branch -d feature/add-user-auth

# === Useful Git commands ===

# Interactive rebase (clean up last 5 commits)
git rebase -i HEAD~5

# Squash commits
# In interactive rebase, change 'pick' to 'squash' or 's'

# Amend last commit
git commit --amend -m "feat(auth): updated message"
git commit --amend --no-edit  # Keep message, add staged files

# Cherry-pick a commit to another branch
git checkout main
git cherry-pick abc1234

# Stash changes
git stash push -m "WIP: auth changes"
git stash list
git stash pop
git stash apply stash@{1}

# Find bug-introducing commit
git bisect start
git bisect bad HEAD
git bisect good v1.0.0
# Test each commit, then:
git bisect good  # or git bisect bad
git bisect reset

# View pretty log
git log --oneline --graph --all --decorate

# Show changes in a commit
git show abc1234

# Blame (who changed what)
git blame src/auth.js

# Search commit messages
git log --grep="auth" --oneline

# Search code changes
git log -S "authenticate" --oneline

# Undo last commit (keep changes)
git reset --soft HEAD~1

# Undo last commit (discard changes)
git reset --hard HEAD~1

# Restore a file from another branch
git checkout main -- src/config.js

# Clean untracked files
git clean -fd        # Remove untracked files and dirs
git clean -fdn       # Dry run

# Tags for releases
git tag -a v1.2.0 -m "Release v1.2.0: Add auth module"
git push origin v1.2.0
git push origin --tags