Master The Git Stack

# 1. Base branch for database migration
git checkout -b feature/db-schema main
git commit -m "feat(db): create user profile schema"
git push -u origin feature/db-schema

# 2. Middle branch stacked on schema
git checkout -b feature/api-routes feature/db-schema
git commit -m "feat(api): profile REST endpoints"
git push -u origin feature/api-routes

# 3. Top branch stacked on API
git checkout -b feature/ui-screen feature/api-routes
git commit -m "feat(ui): profile settings modal"
git push -u origin feature/ui-screen

# 1. Update the parent branch
git checkout feature/db-schema
git commit --amend --no-edit
git push -f origin feature/db-schema

# 2. Rebase child onto updated parent
git checkout feature/api-routes
git rebase --onto feature/db-schema HEAD@{1} feature/api-routes
git push -f origin feature/api-routes

# 3. Rebase top grandchild onto updated child
git checkout feature/ui-screen
git rebase --onto feature/api-routes HEAD@{1} feature/ui-screen
git push -f origin feature/ui-screen

# 1. Locate all unreachable commits
git fsck --lost-found | grep commit

# 2. Inspect the commit message and diff to verify your code
git show <COMMIT_SHA>

# 3. Restore the commit into your working branch
git merge <COMMIT_SHA>
# or
git cherry-pick <COMMIT_SHA>

# Push with descriptive name including newly created files (-u)
git stash push -u -m "wip: checkout form stripe webhook logic"

# Preview the patch diff without modifying working directory
git stash show -p stash@{0}

# Apply specific stash by index without removing it from stack
git stash apply stash@{0}

# Pop to apply and delete from stack
git stash pop stash@{0}