MEPX
Chapter 9 of 14All chapters
  1. 1What Git is
  2. 2The three places
  3. 3Committing
  4. 4History and diffs
  5. 5Branches
  6. 6Merging
  7. 7Conflicts
  8. 8Remotes
  9. 9Fetch, pull and push
  10. 10Undoing work
  11. 11Stashing
  12. 12Ignoring files
  13. 13Tags and releases
  14. 14Working with others

Chapter 9 of 14

Fetch, pull and push

Moving commits between copies.

Fetch before you pull

git fetch downloads new commits and updates your view of the remote without touching your branch. git pull is a fetch followed by a merge, so it can change your files and can conflict.

  • Fetch is always safe, which makes it the habit worth having.
  • git pull --rebase replays your local commits on top instead of merging.

Pushing

git push sends your commits up and is refused if the remote has commits you do not have. Fetch and integrate first rather than reaching for --force, which overwrites other people's work.