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 12: Line 12:
 
  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                                                                                       # If you are out of date, continue
  git fetch pymol master                                                                                      # If you are out of date
+
  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 ==
 
== Zip files ==
 
One can make a zip file of the scripts, to add to the download page at Github
 
One can make a zip file of the scripts, to add to the download page at Github

Revision as of 12:46, 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                                                                                       # 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, 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