Changes between Version 70 and Version 71 of DeveloperGuidelines/Git

Timestamp:

09/18/13 11:17:12 (12 years ago)

Author:

Pat Tressel

Comment:

--

DeveloperGuidelines/Git

@@ -190 +190 @@
 and this is a fast operation in git.
 
+To make a new branch equivalent to the current branch:
+{{{
+git checkout -b <new_branch_name>
+}}}
+
+To switch from one branch to another, just check out the other branch:
+(((
+git checkout <other_branch>
+}}}
+
+Note git will not let you switch to a different branch if you have uncommitted changes in tracked files.
+To get around this, the simplest thing to do is to commit your modified files in a temporary commit,
+then undo that commit later. You can also "stash" your work, which actually makes a commit on a special
+branch. Since it's easy to forget what's in the stash, unless you're only stashing briefly, a real commit
+with an informative message is probably better.
+
+To list all the branches in the repository:
+{{{
+git branch -v
+}}}
+The -v (for verbose) tells git to show not just the branch names, but also the head commit's revision number and message.
+
+To rename the current branch:
+{{{
+git branch -m <new_branch_name>
+}}}
+
+To rename a branch that is not checked out:
+{{{
+git branch -m <old_branch_name> <new_branch_name>
+}}}
+
+To delete a branch:
+{{{
+git branch -d <branch_to_delete>
+}}}
+
+Under some circumstances, git will complain when you try to rename or delete a branch. If you are sure
+you want to do it, use -M instead of -m for rename, or -D instead of -d for delete.
 === Creating a second working directory and repository ===
 If you wish to have multiple directories containing different branches, you can run these as separate web2py applications.