User Tools

Site Tools


computing:git

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revisionPrevious revision
Next revision
Previous revision
Last revisionBoth sides next revision
computing:git [2013/12/18 15:46] – [Private copy of a repository and pull requests] clangecomputing:git [2017/03/04 15:20] – [CMSSW and github] iwn
Line 1: Line 1:
 ====== CMSSW and github ====== ====== CMSSW and github ======
 +<WRAP column 50%>
   * [[http://cms-sw.github.io/cmssw/faq.html|CMSSW github FAQ]]   * [[http://cms-sw.github.io/cmssw/faq.html|CMSSW github FAQ]]
   * [[https://help.github.com/articles/how-do-i-add-a-collaborator|How to add collaborators]]   * [[https://help.github.com/articles/how-do-i-add-a-collaborator|How to add collaborators]]
   * [[http://git-scm.com/book|Git Book]]   * [[http://git-scm.com/book|Git Book]]
 +  * [[https://education.github.com/git-cheat-sheet-education.pdf|Git Cheat Sheet]]
   * [[https://indico.cern.ch/conferenceDisplay.py?confId=286055|Git tutorial]]   * [[https://indico.cern.ch/conferenceDisplay.py?confId=286055|Git tutorial]]
   * [[computing:git:basics|Basic git commands to work with CMSSW]]   * [[computing:git:basics|Basic git commands to work with CMSSW]]
 +</WRAP> 
 +<WRAP column 50%> 
 +{{ computing:git_diagram.png ? 260}} 
 +</WRAP>
 ====== SVN switcher guide ====== ====== SVN switcher guide ======
  
Line 45: Line 49:
 echo "Your github username has been set to \"$GITUSER\"" echo "Your github username has been set to \"$GITUSER\""
 git clone git@github.com:$GITUSER/ExoDiBosonResonances git clone git@github.com:$GITUSER/ExoDiBosonResonances
 +cd ExoDiBosonResonances
 </code> </code>
  
Line 69: Line 74:
 and merge and merge
  
-  git merge FETCH_HEAD+  git merge edbr_tautau cms-edbr/edbr_tautau 
 +  git merge FETCH_HEAD origin/master #generally
  
 To preview what this would do you can try To preview what this would do you can try
  
-  git log ..FETCH_HEAD +  git log ..cms-edbr/edbr_tautau 
-  git diff ...FETCH_HEAD+  git diff ...cms-edbr/edbr_tautau #used to be FETCH_HEAD
  
 5. Make local changes, add these files for a commit and commit 5. Make local changes, add these files for a commit and commit
Line 88: Line 94:
 <code> <code>
 git push origin edbr_tautau git push origin edbr_tautau
 +git push origin master #generally
 </code> </code>
  
computing/git.txt · Last modified: 2017/03/04 15:20 by iwn