This shows you the differences between two versions of the page.
Both sides previous revision Previous revision Next revision | Previous revision Next revision Both sides next revision | ||
git [2013/06/13 21:24] walter [Issues] |
git [2013/06/13 21:41] walter |
||
---|---|---|---|
Line 1: | Line 1: | ||
====== About ====== | ====== About ====== | ||
- | **This information is out of date** | ||
- | **Currently you can only host repos out of your home directory, if you want to secure it setup http auth** | + | The acm has member git hosting at http://acm.cs.uic.edu/git via a web interface. |
- | + | ||
- | The acm has member git hosting at http://acm.cs.uic.edu/git. | + | |
Public Repos at https://acm.cs.uic.edu/git/public | Public Repos at https://acm.cs.uic.edu/git/public | ||
+ | |||
+ | Refer the the help section of the git website for instuctions. | ||
+ | |||
+ | Instuctions for local repos are listed below | ||
- | ====== Issues (Current Running Version) ====== | + | ===== Issues (Current Running Version) ===== |
* June 13, 2013 | * June 13, 2013 | ||
* Does not allow for public visibility of public project, except for repos that you yourself have created. | * Does not allow for public visibility of public project, except for repos that you yourself have created. | ||
* Not sure if this is just me, but it doesn't seem like you are able to submit pull requests to other's repos. (Not tested extensively though...) | * Not sure if this is just me, but it doesn't seem like you are able to submit pull requests to other's repos. (Not tested extensively though...) | ||
+ | |||
+ | ====== Local Repositiories ====== | ||
- | ====== Creation ====== | + | ===== Creation ===== |
be connected to ACM | be connected to ACM | ||
ssh acm.cs.uic.edu | ssh acm.cs.uic.edu | ||
Line 49: | Line 52: | ||
The syntax for this command is "push toBranch fromBranch" | The syntax for this command is "push toBranch fromBranch" | ||
git remote push origin master | git remote push origin master | ||
- | ====== Collaborating ====== | + | ===== Collaborating ===== |
- | ===== setup ===== | + | ==== setup ==== |
working on a project with a partner that has already started: | working on a project with a partner that has already started: | ||
Line 67: | Line 70: | ||
git init | git init | ||
git remote add origin ssh://acm.cs.uic.edu:~/git/project.git | git remote add origin ssh://acm.cs.uic.edu:~/git/project.git | ||
- | git remote add friend http://acm.cs.uic.edu/git/friend/git/project.git | + | git remote add friend http://acm.cs.uic.edu:~/some path/git/friend/git/project.git |
git remote update | git remote update | ||
git merge friend | git merge friend | ||
| | ||
- | ===== working ===== | + | ==== working ==== |
git add . | git add . | ||
git commit | git commit | ||
- | ==== Sharing changes ==== | + | === Sharing changes === |
git push origin master | git push origin master | ||
| | ||
- | ==== getting updates ==== | + | === getting updates === |
git remote update | git remote update | ||
git merge friend | git merge friend | ||
+ | ===== Creation ===== | ||
| | ||
- | ==== resolving conflicts ==== | + | === resolving conflicts === |
git mergetool [-t vimdiff] | git mergetool [-t vimdiff] |