Difference between revisions of "Git/branch"

Revision as of 19:25, 11 June 2023

A "branch" is a separate copy (of the files involved in a project) which can be worked on without affecting the original copy.

"Branching" is a concept basic to most version control systems.

Information:

Actions:

git branch <name> creates a new branch called "name", pointing at the current HEAD revision
git checkout <name> moves HEAD to point to the branch called "name"
- Note: git checkout -b <name> accomplishes both of the above in a single command
git branch -d <branch name> to delete a branch
- Note: must be in a different branch

The basic sequence of events for creating a new branch called "test", updating it, then reverting back to the original branch:

git branch test - create the branch
git checkout test - switch to it
stage whatever changes you want to include in "test"
- This can include adding any new files you've created for this branch.
git commit -a -m 'made a change' - commit the change to "test"
git checkout master - switch back to the main branch (removes new files, restores any you deleted)

2019-10-07 How To Rename a Local and Remote Git Branch
- Basically: git branch -m <new_name> renames the branch locally and doesn't mess with anything upstream. It's like you just created <new_name> and put stuff in it.
- Note: if the branch is not in the local repository, then you just need to git fetch it after the git checkout <old_name>.

@@ Line 30: / Line 30: @@
 ===How To===
 * '''2019-10-07''' [https://linuxize.com/post/how-to-rename-local-and-remote-git-branch/ How To Rename a Local and Remote Git Branch]
+** Basically: <tt>git branch -m {{arg|new_name}}</tt> renames the branch locally and doesn't mess with anything upstream. It's like you just created {{arg|new_name}} and put stuff in it.
 ** Note: if the branch is not in the local repository, then you just need to [[git fetch]] it after the <code>git checkout &lt;old_name&gt;</code>.