Changes between Version 71 and Version 72 of DeveloperGuidelines/Git

Timestamp:

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

Author:

Pat Tressel

Comment:

--

DeveloperGuidelines/Git

@@ -229 +229 @@
 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.
+
+If you will be working on a specific branch for a particular event (e.g. a deployment or hackathon),
+then you can add that branch to your local repository:
+{{{
+git remote add <branch_name> https://github.com/flavour/<branch_name>.git
+git fetch <branch_name>
+}}}
+Now you have both the master branch from the trunk repository, and the specific branch <branch_name>.
+
+You can push branches other than master to your !GitHub repository.
+{{{
+git push -u origin <branch_name>
+}}}
+Note it is good to specify the branch name to push, else git will try to push all of them.
+The -u tells git to make your local branch "track" the remote branch. This is only needed on
+the first push to that branch.
+
+If you need a specific revision of the current branch, your can check out that revision on a new branch:
+{{{
+git checkout -b <revision> <branch_name>
+}}}
+(git requires a name for a branch if you want to preserve commits.)
 === 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.