[VSTS] Git command reference - Merge and rebase

了解該篇文章 Git command reference 的 Merge and rebase 說明並記錄

目的：Merge a branch into the current branch
git 語法：git merge branchname In the Team Explorer Branches view, right-click the branch you want to
Team Explorer 畫面：

目的：Merge a remote branch into the current branch
git 語法：git pull origin branchname
Team Explorer 畫面：

目的：Rebase your current branch onto the history of another branch
git 語法：git rebase branchname
Team Explorer 畫面：

目的：Do an interactive rebase of the last n commits
git 語法：git rebase -i "HEAD^n" (Windows)
Team Explorer 畫面：無，只能使用語法操作

目的：Cherry-pick a commit into the current branch
git 語法：git cherry-pick commitID
Team Explorer 畫面：

參考資料
• Git command reference