Git

# Debian/Ubuntu
sudo apt install git

# Arch Linux
sudo pacman -S git

# RHEL/Fedora
sudo dnf install git

brew install git

winget install git

git config --global user.name  "Your Name"
git config --global user.email "you@example.com"

# List branches (* marks current)
git branch

# Create and switch to a new branch
git switch -c <branch>

# Switch to an existing branch
git switch <branch>

# Fast-forward merge
git merge --ff-only <branch>

# Merge with a merge commit (no fast-forward)
git merge --no-ff <branch>

# Rebase current branch on top of another
git rebase <branch>

# Rebase instead of merge on pull
git pull --rebase origin main

# Delete a local branch (safe, refuses if unmerged)
git branch -d <branch>

# Delete a remote branch
git push origin --delete <branch>

# Rename current branch
git branch -m <new-name>

# After a conflict, edit the files, then:
git add <resolved-file>
git merge --continue

# Or abort the merge entirely
git merge --abort

# Track a newly created branch
git push -u origin <branch>

# Fetch without merging
git fetch --all --prune

# Push all local branches
git push --all origin

# Push tags
git push --tags

# Set upstream for current branch
git branch --set-upstream-to=origin/<branch>

# Show remote URLs
git remote -v

# Add a new remote
git remote add <name> <url>

# Stash current changes
git stash

# Stash with a descriptive message
git stash push -m "work in progress on feature X"

# Stash including untracked files
git stash push --include-untracked

# Stash only staged changes
git stash push --staged

# List all stashes
git stash list

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

# Apply and remove the most recent stash
git stash pop

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

# Show what a stash contains
git stash show -p stash@{0}

# Drop a specific stash
git stash drop stash@{1}

# Clear all stashes
git stash clear

# Create a branch from a stash
git stash branch <new-branch> stash@{0}

# Rebase the last 5 commits interactively
git rebase -i HEAD~5

# Rebase onto a branch interactively
git rebase -i main

# Start interactive rebase for last 3 commits
git rebase -i HEAD~3

# In the editor, change "pick" to "squash" on commits to combine:
# pick abc1234 Add feature
# squash def5678 Fix typo in feature
# squash ghi9012 Another fix
# Save and close, then edit the combined commit message

# Apply a single commit
git cherry-pick <commit-hash>

# Apply multiple commits
git cherry-pick <hash1> <hash2> <hash3>

# Apply a range of commits (exclusive start, inclusive end)
git cherry-pick <start-hash>..<end-hash>

# Cherry-pick without committing (stage changes only)
git cherry-pick --no-commit <commit-hash>

# Abort a cherry-pick in progress
git cherry-pick --abort

# Continue after resolving conflicts
git cherry-pick --continue

# Show reflog for HEAD
git reflog

# Show reflog for a specific branch
git reflog show <branch>

# Recover a commit after a bad reset
git reflog
# Find the commit hash, then:
git reset --hard <commit-hash>

# Recover a deleted branch
git reflog
# Find the last commit of the branch, then:
git branch <branch-name> <commit-hash>

# Show reflog with timestamps
git reflog --date=relative

git config gc.reflogExpire 180.days
git config gc.reflogExpireUnreachable 90.days

# List your GPG keys
gpg --list-secret-keys --keyid-format=long

# Configure Git to use your key
git config --global user.signingkey <key-id>

# Sign a single commit
git commit -S -m "signed commit"

# Sign all commits by default
git config --global commit.gpgsign true

# Sign tags
git tag -s v1.0 -m "signed release"

# Verify a commit signature
git verify-commit <commit-hash>

# Verify a tag signature
git verify-tag v1.0

# Show signatures in log
git log --show-signature

git config --global gpg.format ssh
git config --global user.signingkey ~/.ssh/id_ed25519.pub

# Create a pre-commit hook that runs a linter
cat > .git/hooks/pre-commit << 'EOF'
#!/bin/sh
echo "Running linter..."
npm run lint
if [ $? -ne 0 ]; then
    echo "Lint failed. Commit aborted."
    exit 1
fi
EOF
chmod +x .git/hooks/pre-commit

# Store hooks in the repository and configure the path
mkdir -p .githooks
# Move hooks into .githooks/
git config core.hooksPath .githooks

# Node
node_modules/
dist/

# Python
__pycache__/
*.py[cod]
.venv/

# IDE
.idea/
.vscode/
*.swp

# OS
.DS_Store
Thumbs.db

# Secrets (never commit these)
.env
*.pem

# Check why a file is ignored
git check-ignore -v <file>

# List all ignored files
git status --ignored

# Normalize line endings (LF in repo, native on checkout)
* text=auto

# Force LF for shell scripts
*.sh text eol=lf

# Force CRLF for Windows batch files
*.bat text eol=crlf

# Binary files (no diff, no merge)
*.png binary
*.jpg binary
*.pdf binary

# Custom diff driver for specific files
*.csv diff=csv

# LFS tracking
*.psd filter=lfs diff=lfs merge=lfs -text

# Linguist overrides (for GitHub language stats)
docs/** linguist-documentation
vendor/** linguist-vendored

# Apply .gitattributes retroactively to normalize line endings
git add --renormalize .
git commit -m "Normalize line endings"

# Install LFS (once per machine)
git lfs install

# Track file types
git lfs track "*.psd"
git lfs track "*.zip"

# Verify tracking (shows tracked files)
git lfs ls-files

# Show LFS configuration
cat .gitattributes

# Fetch LFS objects for current branch
git lfs pull

# Migrate existing files to LFS
git lfs migrate import --include="*.psd" --everything

git config --global alias.st status
git config --global alias.co checkout
git config --global alias.br branch
git config --global alias.ci commit
git config --global alias.lg "log --oneline --graph --all --decorate"
git config --global alias.last "log -1 HEAD"
git config --global alias.unstage "reset HEAD --"
git config --global alias.amend "commit --amend --no-edit"