git
Differences
This shows you the differences between two versions of the page.
|
git [2011/10/31 14:40] walter [About] |
git [2021/05/02 21:36] |
||
|---|---|---|---|
| Line 1: | Line 1: | ||
| - | ====== 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 public git hosting at http://acm.cs.uic.edu/git. | ||
| - | |||
| - | |||
| - | |||
| - | ====== Creation ====== | ||
| - | be connected to ACM | ||
| - | ssh acm.cs.uic.edu | ||
| - | ===== First time ===== | ||
| - | |||
| - | Create a directory called "git" in your home directory. In reality you can put a git project anywhere, but the web interface will only pick it up if it is in a directory called "git". | ||
| - | mkdir -p git | ||
| - | cd git | ||
| - | |||
| - | ===== Create project repo ===== | ||
| - | |||
| - | mkdir -p myproject.git | ||
| - | cd myproject.git | ||
| - | git init --bare | ||
| - | ==== Sharing (optional) ==== | ||
| - | While still in ~/git/myproj.git: | ||
| - | |||
| - | touch git-daemon-export-ok | ||
| - | echo "a nifty project" > description | ||
| - | | ||
| - | |||
| - | ===== Publishing your work ===== | ||
| - | I assume you have already created a local git project with something like the following commands: | ||
| - | cd myProject | ||
| - | git init | ||
| - | vim .gitignore | ||
| - | git add . | ||
| - | git commit | ||
| - | ==== add ACM as remote ==== | ||
| - | Add acm as a remote repo | ||
| - | git remote add origin ssh://user@acm.cs.uic.edu:~/git/myproj.git | ||
| - | | ||
| - | === Push! === | ||
| - | The syntax for this command is "push toBranch fromBranch" | ||
| - | git remote push origin master | ||
| - | ====== Collaborating ====== | ||
| - | ===== setup ===== | ||
| - | |||
| - | working on a project with a partner that has already started: | ||
| - | |||
| - | on acm, run these comands | ||
| - | ssh acm.cs.uic.edu | ||
| - | mkdir -p git/project.git | ||
| - | cd git/project.git | ||
| - | git init --bare | ||
| - | echo "my project is awesome" > description | ||
| - | touch git-daemon-export-ok | ||
| - | | ||
| - | |||
| - | on your local machine run these commands: | ||
| - | mkdir project | ||
| - | git init | ||
| - | 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 update | ||
| - | git merge friend | ||
| - | | ||
| - | ===== working ===== | ||
| - | |||
| - | git add . | ||
| - | git commit | ||
| - | |||
| - | ==== Sharing changes ==== | ||
| - | |||
| - | git push origin master | ||
| - | | ||
| - | ==== getting updates ==== | ||
| - | |||
| - | git remote update | ||
| - | git merge friend | ||
| - | | ||
| - | ==== resolving conflicts ==== | ||
| - | |||
| - | git mergetool [-t vimdiff] | ||
| - | fix problems, then | ||
| - | git commit | ||
| - | |||
git.txt ยท Last modified: 2021/05/02 21:36 (external edit)
Page Tools
Except where otherwise noted, content on this wiki is licensed under the following license: CC Attribution-Noncommercial-Share Alike 4.0 International
