Intelligent and Interactive Systems

User Tools

Site Tools


collab: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
collab:git [2012/03/15 10:55]
c703101 [Basic Workflow]
collab:git [2018/09/03 19:35] (current)
Line 1: Line 1:
 ====== Git ====== ​ ====== Git ====== ​
 +
 Git is an extremely powerful and flexible revision control system, and using it effectively requires adherence to conventions. Git is an extremely powerful and flexible revision control system, and using it effectively requires adherence to conventions.
  
Line 5: Line 6:
  
   * A distinct tree / a repository - is maintained for each independent (software, paper, ...) project.   * A distinct tree / a repository - is maintained for each independent (software, paper, ...) project.
-  * For each project, the mainline (master) tree is hosted ​here at the iis uibk servers.+  * For each repository, the mainline (master) tree is hosted ​on the git.uibk.ac.at server.
   * Contributors develop locally and maintain their own trees, and push (or request to pull) only generally-useful,​ tried-and-proven patch sets into the main tree.   * Contributors develop locally and maintain their own trees, and push (or request to pull) only generally-useful,​ tried-and-proven patch sets into the main tree.
   * Where appropriate,​ multiple external developers can exchange patches among each others before committing to the mainline.   * Where appropriate,​ multiple external developers can exchange patches among each others before committing to the mainline.
Line 11: Line 12:
  
  
 +Please adhere to basic guidelines for [[git-usage]].
 ===== Basic Workflow ===== ===== Basic Workflow =====
-**Update: Port 2222 is depricated. All services run additionally on Port 22**+
  
 {{ :​collab:​git-usage.png?​300|git std. usage}} {{ :​collab:​git-usage.png?​300|git std. usage}}
Line 18: Line 20:
 Retrieve an %%IIS%% Git tree for you to work on: Retrieve an %%IIS%% Git tree for you to work on:
  
-  git clone ssh://iis.uibk.ac.at/​projects/​git/​PROJECTNAME+  git clone https://git.uibk.ac.at/​iis-XXXX/​PROJECTNAME 
 +   
 +''​PROJECTNAME''​ will typically include a path portion.
  
 Prepend the hostname with ''​USERNAME@''​ if your Git username does not match your local username. Prepend the hostname with ''​USERNAME@''​ if your Git username does not match your local username.
Line 43: Line 47:
 For more information,​ see the [[http://​gitref.org/​|Git Reference]] and [[http://​www.kernel.org/​pub/​software/​scm/​git/​docs/​everyday.html|Everyday Git]]. For more information,​ see the [[http://​gitref.org/​|Git Reference]] and [[http://​www.kernel.org/​pub/​software/​scm/​git/​docs/​everyday.html|Everyday Git]].
  
 +A ''​git pull''​ will automatically merge any edits other people have pushed in the meantime. ​ However, this will fail if such edits happened in the same section of a file as the changes you are trying to push.  In this case, ''​git pull''​ will signal a merge conflict, which needs to be resolved by hand.
  
-==== Comparison ​to Subversion ====+[[http://​www.rosipov.com/​blog/​use-vimdiff-as-git-mergetool/​|Here]] you may find a nice tutorial on how you can do merging by using vimdiff (you should be able to use vim for using it).
  
-Here, two key distinctions from SVN are+ 
 + 
 + 
 +===== Understanding Git ===== 
 + 
 +[[http://​eagain.net/​articles/​git-for-computer-scientists/​|Here]] is an excellent and brief explanation of Git's internal representation and how it supports user-level interactions. ​ Very useful to understand Git. 
 + 
 + 
 +Two key distinctions from Subversion (SVNare
  
   * the //staging area// ("​index"​) where you define the changes to be commited. (SVN commits directly from the working directory.)   * the //staging area// ("​index"​) where you define the changes to be commited. (SVN commits directly from the working directory.)
Line 61: Line 74:
 {{ :​collab:​git_revisions_without_branches.png?​400|git revisions wo branches}} {{ :​collab:​git_revisions_without_branches.png?​400|git revisions wo branches}}
  
- +  ​
-==== Creating a New Git Project ==== +
- +
-To create a shared Git repository, [[intranet:​systems:​docs:​git-ssh#​creating_a_shared_git_repository|initialize it on the lab server]]. ​ Then, [[#​basic_workflow|clone and populate]] it. +
- +
-To create your personal Git repository for your own, local use only: +
- +
-  cd PROJECTROOT +
-  git init --shared +
-  git add . +
-  git commit -m "​initial import"​+
  
 ==== Textmode Tool For Git ==== ==== Textmode Tool For Git ====
 a nice (commandline) tool for viewing commits, logs, diffs and other changes is tig. to install tig on a debian based machine a nice (commandline) tool for viewing commits, logs, diffs and other changes is tig. to install tig on a debian based machine
-  ​aptitude ​install tig+  ​apt install tig
 change into the git working directory and start change into the git working directory and start
   tig   tig
Line 95: Line 98:
  
  
-==== Ssh Config ====+==== ssh Config ====
  
 You could also create an ssh config file in your home-directory to shorten the git commands: You could also create an ssh config file in your home-directory to shorten the git commands:
Line 103: Line 106:
 Host iis Host iis
     HostName iis.uibk.ac.at     HostName iis.uibk.ac.at
-    Port 2222+    Port 22
     User username     User username
     #​IdentityFile ​ ~/​.ssh/​PRIVATEKEYFILE ​     #​IdentityFile ​ ~/​.ssh/​PRIVATEKEYFILE ​
collab/git.1331805327.txt.gz · Last modified: 2018/09/03 14:57 (external edit)