User Tools

Site Tools


git

Differences

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

Link to this comparison view

Both sides previous revision Previous revision
Next revision
Previous revision
git [2011/10/31 14:40]
walter [About]
git [2021/05/02 21:36] (current)
Line 1: Line 1:
-====== ​About ====== +====== ​Git ======
-**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 public git hosting ​at http://​acm.cs.uic.edu/​git.+Public Repos at https://​acm.cs.uic.edu/​git/public
  
 +Refer the the help section of the git website for instructions.
  
 +Instructions for local repos are listed below
  
-====== ​Creation ​======+ 
 + 
 +====== ​Local Repositories and Some Basic Git Help====== 
 +        
 +===== Creation ​=====
 be connected to ACM be connected to ACM
   ssh acm.cs.uic.edu   ssh acm.cs.uic.edu
Line 43: Line 48:
 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 61: Line 66:
   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]
 fix problems, then  ​ fix problems, then  ​
   git commit   git commit
- 
  
git.1320072013.txt.gz · Last modified: 2021/05/02 21:36 (external edit)