This shows you the differences between two versions of the page.

Link to this comparison view

todo-git [2017/03/10 10:50]
dblume [Renaming branches]
todo-git [2018/11/16 08:59] (current)
dblume [Changing a local branch without regard to remote branch]
Line 101: Line 101:
 ====== Renaming branches ====== ====== Renaming branches ======
-To rename a remote branch (where "origin" is the name of the remote repo):+To rename a remote branch:
   - Rename the local one.   - Rename the local one.
Line 115: Line 115:
 </code> </code>
-Now I should see "remotes/origin/roku_dev" gone, and "remotes/origin/SDK_4.2.P2_Roku" appear. 
-I still have local branch called "roku_dev" and it's set to track  "remotes/origin/roku_dev".  Since "remotes/origin/roku_dev" is no longer there, if I try "git pull" on that branch it will say remote reference doesn't exist.+==== Creating a branch (and possibly pushing to upstream origin) ====
-Since I don't have any changes on that local branch that I haven't pushed up to the server before the name change, I can safely delete this local branch, and create a new local branch from "remotes/origin/SDK_4.2.P2_Roku".+  $ git checkout -b new_branch 
 +  Switched to a new branch 'new_branch'
-==== Changing a local branch without regard to remote branch ====+That was the same as "''git branch new_branch; git checkout new_branch''"
-<code> +And now if you want to create that branch name at the remote branch, then:
-$ git checkout -b branch_name +
-Switched to a new branch 'branch_name' +
-That was the same as "git branch branch_name; git checkout branch_name"+  $ git push --set-upstream origin new_branch
 ==== Changing a local branch to a new remote branch ==== ==== Changing a local branch to a new remote branch ====
todo-git.1489171818.txt.gz · Last modified: 2017/03/10 10:50 by dblume
Recent changes RSS feed Driven by DokuWiki