This shows you the differences between two versions of the page.
Both sides previous revision Previous revision | |||
git [2017/08/31 15:21] frank |
git [2017/08/31 15:23] (current) frank |
||
---|---|---|---|
Line 71: | Line 71: | ||
# track current branch to remote branch | # track current branch to remote branch | ||
$ git branch --set-upstream-to [remote-branch] | $ git branch --set-upstream-to [remote-branch] | ||
+ | # track a branch to remote branch | ||
+ | $ git branch --set-upstream-to [remote-branch] [branch] | ||
# merge a branch to current branch | # merge a branch to current branch | ||
$ git merge [branch] | $ git merge [branch] |