Advanced Git

# Stash current uncommitted changes (tracked files)
git stash

# Stash with a descriptive message (highly recommended)
git stash save "WIP: feature X — halfway through the auth logic"

# Also stash untracked (new) files
git stash -u

# List all stashes
git stash list
# stash@{0}: WIP: feature X — halfway through the auth logic
# stash@{1}: WIP on main: abc1234 fix: navbar color

# Apply most recent stash (keeps it in the list)
git stash apply

# Apply AND remove from list (most common)
git stash pop

# Apply a specific stash by index
git stash apply stash@{2}

# Delete a specific stash
git stash drop stash@{0}

# Delete ALL stashes
git stash clear

# Rebase the last 3 commits interactively
git rebase -i HEAD~3
# This opens your configured editor with something like:
#
# pick a1b2c3d feat: add user model
# pick d4e5f6g WIP: testing stuff
# pick h7i8j9k fix: forgot to save
#
# Change 'pick' to:
#   squash (s) — merge into previous commit, combine messages
#   fixup  (f) — merge into previous commit, discard this message
#   reword (r) — keep commit but edit the message
#   drop   (d) — completely remove this commit
#
# Example: squash all 3 into one
# pick a1b2c3d feat: add user model
# fixup d4e5f6g WIP: testing stuff
# fixup h7i8j9k fix: forgot to save
#
# Save and close editor. Git will combine the commits.
# You'll be prompted to write the final commit message.

# Apply a single commit to current branch
git cherry-pick a3f5b2c

# Apply multiple commits
git cherry-pick a3f5b2c d7e9f1a

# Apply a range of commits (from..to, exclusive of first)
git cherry-pick a3f5b2c..d7e9f1a

# Cherry-pick without committing (stage only)
git cherry-pick -n a3f5b2c

# If a conflict arises during cherry-pick:
# 1. Resolve the conflict in your editor
# 2. Stage the resolved file
git add conflicted-file.js
# 3. Continue
git cherry-pick --continue
# Or abort entirely:
git cherry-pick --abort

# --soft: Undo last commit, keep changes staged
# Use when: you want to recommit with a better message or add more files
git reset --soft HEAD~1

# --mixed: Undo last commit, keep files but unstage them
# Use when: you want to review/edit before re-staging
git reset HEAD~1
# (same as --mixed which is the default)

# --hard: Undo last commit AND discard all changes
# Use when: you want to completely throw away the last commit
git reset --hard HEAD~1

# --hard to a specific commit hash
git reset --hard a3f5b2c

# Undo last 3 commits, keep code in working dir
git reset --soft HEAD~3

# View the reflog (last 90 days of HEAD movements)
git reflog
# Output example:
# a3f5b2c HEAD@{0}: reset: moving to HEAD~1
# d7e9f1a HEAD@{1}: commit: feat: add login page
# b2c4e6f HEAD@{2}: commit: feat: add user model

# Recover a commit you "lost" with reset --hard
# Find the commit hash in reflog, then:
git checkout d7e9f1a
# You're now in detached HEAD at that commit

# Recover to a new branch from that point
git switch -c recovery/lost-commit

# Or just cherry-pick the recovered commit into your current branch
git cherry-pick d7e9f1a

# Recover a deleted branch
git reflog | grep "feat/deleted-branch"
git switch -c feat/deleted-branch d7e9f1a

# Annotated tag (recommended — stores tagger, date, message)
git tag -a v1.0.0 -m "Release 1.0.0 — initial public release"

# Lightweight tag (just a name pointing to a commit)
git tag v1.0.0-beta

# Tag a specific past commit
git tag -a v0.9.0 a3f5b2c -m "Pre-release v0.9.0"

# List all tags
git tag
git tag -l "v1.*"  # filter pattern

# Show tag details
git show v1.0.0

# Push a specific tag to remote
git push origin v1.0.0

# Push ALL tags to remote
git push origin --tags

# Delete a local tag
git tag -d v1.0.0-beta

# Delete a remote tag
git push origin --delete v1.0.0-beta

# Add aliases via command line
git config --global alias.st status
git config --global alias.co checkout
git config --global alias.br branch
git config --global alias.lg "log --oneline --graph --decorate --all"
git config --global alias.undo "reset --soft HEAD~1"
git config --global alias.unstage "reset HEAD --"

# Or edit ~/.gitconfig directly — [alias] section:
# [alias]
#   st = status
#   co = checkout
#   br = branch -a
#   lg = log --oneline --graph --decorate --all
#   undo = reset --soft HEAD~1
#   save = !git add -A && git commit -m 'SAVEPOINT'
#   wip = !git add -u && git commit -m 'WIP'

# Other useful global settings
git config --global core.editor "code --wait"   # use VS Code
git config --global push.default current              # push to same-name branch
git config --global pull.rebase true                 # rebase on pull
git config --global init.defaultBranch main           # default branch name