Use Git Fetch instead of Git Pull

紀錄一下使用 git fetch 來更新 branch 的方法, 取代平常使用的 git pull

Use High-level Commands

常見的作法是先 git fetch, 然後 git merge upstream

git fetch origin
git checkout BRANCH_NAME
git merge BRANCH_NAME refs/remotes/origin/UPSTREAM_NAME

若不想產生 merge commit, 也可以使用 git pull, 但已在 local commit 的 commits 會被 rebase

git fetch origin
git checkout BRANCH_NAME
git rebase refs/remotes/origin/UPSTREAM_NAME

若不想讓 local commits 被 rebase, 可以使用 git cherry-pick

git fetch origin
git checkout BRANCH_NAME
git cherry-pick refs/remotes/origin/UPSTREAM_NAME

直接 git update-ref

git fetch origin
git update-ref BRANCH_NAME refs/remotes/origin/UPSTREAM_NAME

或是直接反查 upstream

git fetch origin
git update-ref BRANCH_NAME refs/remotes/`git rev-parse --abbrev-ref BRANCH_NAME@{u}`

Git Written on April 13th, 2022 by Borting