Git admin

From PyMOLWiki
Revision as of 12:53, 3 December 2011 by Tlinnet (talk | contribs) (→‎Useful commands)
(diff) ← Older revision | Latest revision (diff) | Newer revision → (diff)
Jump to navigation Jump to search
The printable version is no longer supported and may have rendering errors. Please update your browser bookmarks and please use the default browser print function instead.

Useful commands

Make a remote for the official repository

git remote                                                                                                  # To see your defined alias for remotes
git remote add pymol https://GIT_USER_NAME@github.com/Pymol-Scripts/Pymol-script-repo.git  

When a user make a Pull request, read more here http://help.github.com/send-pull-requests/

git fetch https://github.com/OTHER_GIT_USER_NAME/Pymol-script-repo master                       
git log GIT_USER_NAME/master ^master                                                                               
git checkout GIT_USER_NAME/master                                                                           # Checkout the changes, try the script. See wikipage

Push the change to the Official repository

git checkout master                                                                                         # Go back to master
git merge GIT_USER_NAME/master                                                                              # Merge in, and you are ready
git push pymol master                                                                                       # If you are out of date, continue
git fetch pymol master                                                                                      # Get latest from the official rep
git branch -a                                                                                               # See all branches
git merge pymol/master                                                                                      # Merge remote branch into yours
git push pymol master                                                                                       # Push to the original repository

Zip files

One can make a zip file of the scripts.

git archive --format zip --output ./Pymol-script-repo.zip master

Additional reading

For more commands on git, look here: http://cheat.errtheblog.com/s/git