This shows you the differences between two versions of the page.
Both sides previous revisionPrevious revisionNext revision | Previous revision | ||
computing:git [2013/12/18 15:00] – hinzmann | computing:git [2017/03/04 15:20] (current) – [CMSSW and github] iwn | ||
---|---|---|---|
Line 1: | Line 1: | ||
====== CMSSW and github ====== | ====== CMSSW and github ====== | ||
- | |||
* [[http:// | * [[http:// | ||
* [[https:// | * [[https:// | ||
* [[http:// | * [[http:// | ||
+ | * [[https:// | ||
* [[https:// | * [[https:// | ||
* [[computing: | * [[computing: | ||
Line 42: | Line 42: | ||
< | < | ||
- | git clone git@github.com: | + | export GITUSER=`git config user.github` |
+ | echo "Your github username has been set to \" | ||
+ | git clone git@github.com: | ||
+ | cd ExoDiBosonResonances | ||
</ | </ | ||
- | This command will also give this URL the name " | + | This command will also give this repository |
3. Make an alias to the main repository | 3. Make an alias to the main repository | ||
Line 53: | Line 56: | ||
</ | </ | ||
- | 4. Pull latest changes in branch edbr_tautau from the main repository | + | You can check the result of this command by typing |
- | < | + | git remote -v |
- | git pull cms-edbr edbr_tautau | + | |
- | </code> | + | 4. Update to the edbr_tautau branch (this will move the HEAD): |
+ | |||
+ | | ||
+ | |||
+ | Fetch latest changes in branch edbr_tautau from the main repository | ||
+ | |||
+ | git fetch cms-edbr edbr_tautau | ||
+ | |||
+ | and merge | ||
+ | |||
+ | git merge edbr_tautau cms-edbr/edbr_tautau | ||
+ | git merge FETCH_HEAD origin/ | ||
+ | |||
+ | To preview what this would do you can try | ||
+ | |||
+ | git log ..cms-edbr/ | ||
+ | git diff ...cms-edbr/ | ||
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 71: | Line 90: | ||
< | < | ||
git push origin edbr_tautau | git push origin edbr_tautau | ||
+ | git push origin master #generally | ||
</ | </ | ||
7. Got to you private respository | 7. Got to you private respository | ||
- | https:// | + | https:// |
- | and make a pull request to move your changes to the project repository by clicking on "Pull Request", | + | and make a pull request to move your changes to the project repository by clicking on "Pull Request", |