[Beginner → Intermediate] — fetch vs pull, pushing safely (including why --force-with-lease exists), and the fork + upstream workflow.
Fetching and Pulling
# Fetch — download remote changes but don't integrate
git fetch # Fetch from all remotes
git fetch origin # Fetch from origin
git fetch origin main # Fetch specific branch
git fetch --all # Fetch all remotes
git fetch --prune # Also delete local refs to deleted remote branches
# Pull — fetch + integrate (merge or rebase depending on config)
git pull # Pull current branch from its upstream
git pull origin main # Pull specific remote/branch
git pull --rebase # Pull with rebase instead of merge
git pull --ff-only # Only pull if fast-forward (safe — refuses if diverged)
git pull --no-ff # Always create merge commit on pull
# The safest pull workflow:
git fetch origin # Download without integrating
git log HEAD..origin/main # See what's new
git merge origin/main # Integrate when readyPushing
git push # Push current branch to its upstream
git push origin main # Push to specific remote/branch
git push -u origin feature # Push and set upstream tracking
git push --all # Push all branches
git push --tags # Push all tags
git push origin :branch # Delete remote branch (old syntax)
git push origin --delete branch # Delete remote branch (modern)
# Force push (use with extreme caution)
git push --force # DANGEROUS — overwrites remote history
git push --force-with-lease # Safer — fails if remote has commits you haven't fetched
# Always use --force-with-lease over --force when you must force-push
# Push a specific local branch to a differently named remote branch
git push origin local-branch:remote-branchWorking with Forks
# Fork workflow
git clone https://github.com/you/repo.git # Clone your fork
git remote add upstream https://github.com/original/repo.git # Add upstream
# Keep fork updated
git fetch upstream
git checkout main
git merge upstream/main # Or: git rebase upstream/main
git push origin main # Push to your fork
# Open a PR: push your feature branch to your fork, then PR on GitHub
git push -u origin feature/my-featureRelated
- Branching Strategies — the forking workflow in full
- GitHub as a Platform — the rules a remote enforces on push
- Branching — tracking branches
- Git course map
Jump to a subject
Software engineering
Infrastructure & security
Computer science
Hardware & engineering