Git manual - Revision history

Hkinks: (by SublimeText.Mediawiker)

2016-09-15T10:42:17Z

(by SublimeText.Mediawiker)

Hkinks: (by SublimeText.Mediawiker)

2016-08-19T07:46:32Z

(by SublimeText.Mediawiker)

Hkinks: (by SublimeText.Mediawiker)

2016-08-19T07:44:59Z

(by SublimeText.Mediawiker)

Hkinks: (by SublimeText.Mediawiker)

2016-08-19T07:44:43Z

(by SublimeText.Mediawiker)

Hkinks: made gitlab link more visible (by SublimeText.Mediawiker)

2016-08-19T07:42:30Z

made gitlab link more visible (by SublimeText.Mediawiker)

Hkinks: made more general (by SublimeText.Mediawiker)

2016-08-19T07:41:12Z

made more general (by SublimeText.Mediawiker)

Hkinks at 10:08, 26 October 2015

2015-10-26T10:08:25Z

Hkinks at 18:46, 5 October 2015

2015-10-05T18:46:39Z

Hkinks: /* Staging area */

2015-09-23T13:21:16Z

‎Staging area

Hkinks at 20:56, 22 September 2015

2015-09-22T20:56:15Z

@@ Line 27: / Line 27: @@
 <source lang="bash" collapse="false">cd /c/workspace</source>
-For example if your Uni-ID is ''john.doe'' and you have made the repository with a name ''myrepo'' then for cloning your existing repository from ''http://gitlab.pld.ttu.ee/u/john.doe/myrepo.git'', type in:
+For example if your Uni-ID is ''john.doe'' and you have made the repository with a name ''myrepo'' then for cloning your existing repository from ''http://gitlab.pld.ttu.ee/john.doe/myrepo.git'', type in:
-<source lang="bash" collapse="false">git clone http://gitlab.pld.ttu.ee/u/john.doe/myrepo.git</source>
+<source lang="bash" collapse="false">git clone http://gitlab.pld.ttu.ee/john.doe/myrepo.git</source>
 Next you will be asked username and password (Uni-ID). As you are typing in password, you will not see the input as asterisk (*) symbols like you might be used to. However, the password input will still work as long as it is the correct password. After that you should be seeing message like:
   warning: You appear to have clone and empty repository.

← Older revision		Revision as of 07:46, 19 August 2016
Line 12:		Line 12:

	In addition, there are many publicly available Git repositories, like github, bitbucket, gitlab; where you can store your code.		In addition, there are many publicly available Git repositories, like github, bitbucket, gitlab; where you can store your code.
−

	==Downloading Git==		==Downloading Git==

@@ Line 7: / Line 7: @@
 For course related code and projects you can use the following repository:
-''[http://gitlab.pld.ttu.ee gitlab.pld.ttu.ee] ''
+'''[http://gitlab.pld.ttu.ee gitlab.pld.ttu.ee] '''
 To login use your INTRA Uni-ID and password. Uni-ID is the same username as the one you use for logging into lab computers. If you do not know your Uni-ID and password, you can get one from ICT-410 or by logging in with ID-card or residence permit at https://pass.ttu.ee.

@@ Line 7: / Line 7: @@
 For course related code and projects you can use the following repository:
-<span style='color:red; text-weight:bold;'>[http://gitlab.pld.ttu.ee gitlab.pld.ttu.ee] </span>
+''[http://gitlab.pld.ttu.ee gitlab.pld.ttu.ee] ''
 To login use your INTRA Uni-ID and password. Uni-ID is the same username as the one you use for logging into lab computers. If you do not know your Uni-ID and password, you can get one from ICT-410 or by logging in with ID-card or residence permit at https://pass.ttu.ee.

@@ Line 6: / Line 6: @@
 == Git repository ==
 For course related code and projects you can use the following repository:
 [http://gitlab.pld.ttu.ee gitlab.pld.ttu.ee]
 To login use your INTRA Uni-ID and password. Uni-ID is the same username as the one you use for logging into lab computers. If you do not know your Uni-ID and password, you can get one from ICT-410 or by logging in with ID-card or residence permit at https://pass.ttu.ee.

@@ Line 1: / Line 1: @@
-==Main commands you will need==
+== What is Git? ==
-  git clone https://git.ttu.ee/ained/iag0581/your-uni-id
+Git is a most widely used version control system for developing code. Essentially what Git allows you to do is easily store the code of your project, including the history of changes and in multiple places if needed. The value of it becomes apparent when multiple people are working on one project and the changes they make to the code take different routes. Git helps with maintaining different changes throughout versions and merging them if needed.
-  git add .
+Git repositories are also a good way of making your code public to the community or keeping a portfolio of projects.
-  git commit -am "comment"
+To learn more about how Git works, you can start from here: [https://git-scm.com/book/en/v2/Getting-Started-Git-Basics Git Basics]
-  git push
-  git pull
+== Git repository ==
 ==Downloading Git==
 https://git-scm.com/downloads
@@ Line 15: / Line 23: @@
 ''Note: Under Windows's Git Bash Ctrl+C and Ctrl+V do not work. If you wish to paste something into Git Bash window, use Insert.''
 ===Cloning===
 Let's say that we want to clone the repository to our local directory at C:\workspace. First we have to change the current directory by typing to terminal:
 <source lang="bash" collapse="false">cd /c/workspace</source>
-For example if your Uni-ID is john.doe ( <span style="color:red">'''NB! all lowercase letters'''</span> ) then for cloning your existing repository from ''https://git.ttu.ee/ained/iag0581/john.doe'', type in:
+For example if your Uni-ID is ''john.doe'' and you have made the repository with a name ''myrepo'' then for cloning your existing repository from ''http://gitlab.pld.ttu.ee/u/john.doe/myrepo.git'', type in:
-<source lang="bash" collapse="false">git clone https://git.ttu.ee/ained/iag0581/john.doe iag0581</source>
+<source lang="bash" collapse="false">git clone http://gitlab.pld.ttu.ee/u/john.doe/myrepo.git</source>
-Next you will be asked username and password. Username is your Uni-ID, which is the same as the one you use for logging into lab computers. If you do not know your Uni-ID and password, you can get one from ICT-410 or by logging in with ID-card or residence permit at https://pass.ttu.ee .
+Next you will be asked username and password (Uni-ID). As you are typing in password, you will not see the input as asterisk (*) symbols like you might be used to. However, the password input will still work as long as it is the correct password. After that you should be seeing message like:
 As you are typing in password, you will not see the input as asterisk (*) symbols like you might be used to. However, the password input will still work as long as it is the correct password. After that you should be seeing message like:
   warning: You appear to have clone and empty repository.
   Checking connectivity.. done.
 Do not be alarmed by the warning, it is normal to see that as you are first starting off with an empty repository
-After you authenticate yourself succesfully, the repository is cloned into the local directory C:\workspace\iag0581 and we can change also our current directory to it by typing:
+After you authenticate yourself succesfully, the repository is cloned into the local directory C:\workspace\myrepo and we can change also our current directory to it by typing:
-<source lang="bash" collapse="false">cd iag0581</source>
+<source lang="bash" collapse="false">cd myrepo</source>
-−
-====Common problems when cloning====
-* Username should be in lowercase letters
-* Do not forget ''http<span style="color:red">s</span>://'' from the beginning of URL
-* The URL should be only used through git software. Through web browser it does not work.
 ===Staging area===
 Next we can start adding files for version control. Let's say that we already have some files in another directory (C:\workspace\lab1) that we wish to add to version control. Use file manager to copy the files into the repository or for copying files from the terminal there is a command '''cp'''.
-<source lang="bash" collapse="false">cp /c/workspace/lab1 /c/workspace/iag0581 -rf</source>
+<source lang="bash" collapse="false">cp /c/workspace/lab1 /c/workspace/myrepo -rf</source>
 ''Note: Git bash on Windows OS uses Unix notation for directory paths. So instead of 'C:\example', you would have to use '/c/example'.''
@@ Line 54: / Line 51: @@
 To see all the files in the staging area for making sure we are ready to commit the changes, there is a command '''git status''' which lists all the new and modified files to be committed.
-===Committing===
+=== Identifying yourself ===
-Before committing it is required to set up your name and e-mail with git. To do that there are following commands that should be inserted:
+Before continuing and committing the changes we made it is required to set up your name and e-mail with Git in order to let the repository know who is making the commits. In the class computers it should be automatically set. Othwerise, to do that there are following commands that should be inserted:
 <source lang="bash" collapse="false">
    git config --global user.email "you@example.com"
    git config --global user.name "Your Name"
 </source>
-Next we can commit the changes with the command:
+===Committing===
 <source lang="bash" collapse="false">git commit -am "your comment about the commit"</source>
 ===Pushing===
 Now that the changes are stored locally we may want to push the changes back to remote repository also. To do that there is the command '''git push'''
 <source lang="bash" collapse="false">git push origin master</source>
-Origin and master specify to which remote repository and branch the commit will be pushed into.
+Origin and master specify to which remote repository and branch the commit will be pushed into. For later commits they can be omitted if default and repository '''origin''' and branch '''master''' is used.
 Next your username and password will be asked. (The same username and password that you use for logging in to the lab computers).
 If you want to make sure that the push was successfully made, you can simply clone your repository in another folder and see if the contents have been updated.
@@ Line 93: / Line 92: @@
 For deleting:
 <source lang="bash" collapse="false">git branch -D <branch name></source>
 ==Documentation==

@@ Line 1: / Line 1: @@
 ==Downloading Git==
 https://git-scm.com/downloads
@@ Line 9: / Line 17: @@
 ''Note: Under Windows's Git Bash Ctrl+C and Ctrl+V do not work. If you wish to paste something into Git Bash window, use Insert.''
-Each student has already a repository generated beforehand with URL looking like this:
+Each student has already a repository generated beforehand with URL looking like this: ''https://git.ttu.ee/ained/iag0581/<UNI-ID>'' (Note: This link is not meant to be used through web browser as there is no web interface for the git repositories. Use it only with git software.)
-−
- <nowiki>https://git.ttu.ee/ained/iag0581/<UNI-ID></nowiki>
-''Note: This link is not meant to be used through web browser as there is no web interface for the git repositories. Use it only with git software.''
 For authentication your Uni-ID will be used. (The same username and password that you use for logging in to the lab computers).
@@ Line 61: / Line 66: @@
 Origin and master specify to which remote repository and branch the commit will be pushed into.
 Next your username and password will be asked. (The same username and password that you use for logging in to the lab computers).
 ===Pulling===
 For the next scenario, let's say that we have repositories cloned locally to both lab computer and computer at home. Now when we have made changes to repository while working from lab and we want to update the local repository from home, '''git pull''' is used. Git pull incorporates changes from a remote repository into the current local branch.