This is a read-only mirror of pymolwiki.org

Difference between revisions of "Git admin"

From PyMOL Wiki
Jump to navigation Jump to search
Line 8: Line 8:
 
  git log GIT_USER_NAME/master ^master                                                                               
 
  git log GIT_USER_NAME/master ^master                                                                               
 
  git checkout GIT_USER_NAME/master                                                                          # Checkout the changes, try the script. See wikipage
 
  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 checkout master                                                                                        # Go back to master
 
  git merge GIT_USER_NAME/master                                                                              # Merge in, and you are ready
 
  git merge GIT_USER_NAME/master                                                                              # Merge in, and you are ready
 
  git push pymol master
 
  git push pymol master
  git fetch pymol master                                                                                             # If you receive a warning
+
  git fetch pymol master                                                                                     # If you are out of date
 
+
  
 
Make a zip file of the scripts, to add to the download page at Github
 
Make a zip file of the scripts, to add to the download page at Github
  git archive --format zip --output ./zip_archives/Pymol-script-repo_DATE.zip master
+
  git archive --format zip --output ./Pymol-script-repo.zip master
  
 
== Additional reading ==
 
== Additional reading ==
 
For more commands on git, look here: http://cheat.errtheblog.com/s/git
 
For more commands on git, look here: http://cheat.errtheblog.com/s/git

Revision as of 12:40, 3 December 2011

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

git fetch https://github.com/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
git fetch pymol master                                                                                      # If you are out of date

Make a zip file of the scripts, to add to the download page at Github

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