Push Git Branch to Remote and Set upstream

把 local 的 branch push 到 remote 後, 通常也會同步設定將 local 的 branch 的 upstream 設成 remote branch. 這樣之後 fetch/pull 時就會自動更新. 以下紀錄作法.

Set Upstream for a Branch

• 在第一次 push 到 remote 時直接設定 upstream

  git push -u REMOTE_NAME LOCAL_BRANCH_NAME[:REMOTE_BRANCH_NAME]
  

• 若 local branch 已經 push 到 remote, 可以額外下指令設定 upstream.

  git push REMOTE_NAME LOCAL_BRANCH_NAME
  git branch --set-upstream-to=REMOTE_NAME/REMOTE_BRANCH_NAME LOCAL_BRANCH_NAME
  

Push Changes to Upstream

當 upstream 已經設定後, 可以透過已下兩種方式 push 到 remote

• 先 checkout branch 再 push

  git checkout BRANCH_NAME
  git push
  

• 若不先 checkout branch, 則要輸入 remote name

  git push REMOTE_NAME BRANCH_NAME
  

Pull Changes from upstream

Set Merge Rule for a Branch

• 當從 remote pull 下來時, 可以設定 branch 只能走 fast-forward merge

  git config branch.BRANCH_NAME.mergeOptions --ff-only
  

  如此, 在 .git/config 可以看到

  [branch "BRANCH_NAME"]
    mergeOptions = --ff-only
  

Set Global Pull Rule

• Use rebase as default pull merge rule

  git config --global pull.rebase true
  

Ignore Merging Commit and Rebase

• 因為 git 預設 pull.rebase 為 false, 此時 pull 後會採用 merge 方式, pull 後 local branch 的 commit 產生一個新的 merge commit
• 如果 git pull 後, 產生一個新的 merge commmit, 但此時 remote 又有新的 commit 時, 此時 push 會失敗. 解決方法

  git fetch origin
  git rebase −p REMOTE_NANE/REMOTE_BRANCH_NAME
  

Reference

• How do I push a new local branch to a remote Git repository and track it too?
• Enforce fast forward as merge strategy in Git
• Git - When to Merge vs. When to Rebase
• Git Push to Remote Branch – How to Push a Local Branch to Origin

Git Written on March 28th, 2022 by Borting

---

---