User Tools

Site Tools


how_to_work_with_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
how_to_work_with_git [2017/10/02 12:05]
tsaue
how_to_work_with_git [2017/10/02 15:20] (current)
tsaue
Line 4: Line 4:
 Git is a program that helps multiple developers work together on a program simultaneously. Every revision to the source code is retained, so if something goes wrong it is always possible to go back to a previous state. ​ Git is a program that helps multiple developers work together on a program simultaneously. Every revision to the source code is retained, so if something goes wrong it is always possible to go back to a previous state. ​
  
-=== Main differences that surprise Subversion users ===+===== Main differences that surprise Subversion users =====
  
 You can probably skip this if you have never worked with Subversion or CVS.  You can probably skip this if you have never worked with Subversion or CVS. 
Line 16: Line 16:
 ''​git checkout''​ is at first sight rather different from ''​svn checkout''​. You can use ''​git checkout''​ to switch to another branch or to revert modifications but not to clone the repository. However, the more you use Git the more ''​git checkout''​ will resemble ''​svn checkout''​. ''​git checkout''​ is at first sight rather different from ''​svn checkout''​. You can use ''​git checkout''​ to switch to another branch or to revert modifications but not to clone the repository. However, the more you use Git the more ''​git checkout''​ will resemble ''​svn checkout''​.
  
-=== Before you start working with git ===+===== Before you start working with git =====
  
 It is highly recommended to set the following for the optimum git experience: Colorize your life!  It is highly recommended to set the following for the optimum git experience: Colorize your life! 
Line 37: Line 37:
    $ git config branch.master.mergeoptions "​--no-f    $ git config branch.master.mergeoptions "​--no-f
        
-=== Recommended reading and viewing ===+===== Recommended reading and viewing ​=====
    
   * [[http://​git-scm.com/​course/​svn.html|Here]] is a very nice collection of essential commands especially for people coming from the Subversion world: ​   * [[http://​git-scm.com/​course/​svn.html|Here]] is a very nice collection of essential commands especially for people coming from the Subversion world: ​
Line 53: Line 53:
    $ man gitglossary    $ man gitglossary
        
-=== Basic work ===+===== Basic work =====
  
 You can live a fulfilled life with the following few Git commands: ​ You can live a fulfilled life with the following few Git commands: ​
   * Clone the repository (checkout a working copy in Subversion speak): ​   * Clone the repository (checkout a working copy in Subversion speak): ​
-      + 
-     ​$ git clone git@repo.ctcc.no:​project_name.git ​+   ​$ git clone git@gitlab.com:​project_name.git 
 + 
 +  * Update your repository with changes from origin (svn update): 
 + 
 +   $ git pull 
 + 
 +  * Browse the history: 
 + 
 +   $ git log --topo-order --decorate [--oneline --graph] 
 + 
 +  * Add a file: 
 + 
 +   $ git add 
 + 
 +  * Move or rename: 
 + 
 +   $ git mv 
 + 
 +  * Remove: 
 + 
 +   $ git rm 
 + 
 +  * See which files are modified since last commit: 
 + 
 +   $ git status 
 + 
 +  * Browse the history and see which files have been modified: 
 + 
 +   $ git log --stat 
 + 
 +  * See your modifications:​ 
 + 
 +   $ git diff 
 + 
 +  * Commit all uncommitted modifications:​ 
 + 
 +   $ git commit -a 
 + 
 +  * Commit a specific file: 
 + 
 +   $ git commit  
 + 
 +  * Publish your changes to upstream (svn commit): 
 + 
 +   $ git push 
  
how_to_work_with_git.1506938730.txt.gz · Last modified: 2017/10/02 12:05 by tsaue