Summary

• Page properties (1 modified, 0 added, 0 removed)
• Objects (1 modified, 0 added, 0 removed)
  • Confluence.Code.ConfluencePageClass[0]

Details

Page properties

Content

...	...	@@ -1,6 +1,6 @@
1	1	This tutorial will address the source code management (SCM) tool named [[Git>>url:http://git-scm.com/||shape="rect"]]. By following these steps you should learn about the basic usage of Git, which is required for the whole practical course. Furthermore, Git is a great SCM tool, and it's good to know how to use it. During this tutorial, we will follow Alan Turing's thoughts towards developing the [[Turing Machine>>url:http://en.wikipedia.org/wiki/Turing_machine||shape="rect"]].
2	2
3		-More in-depth documentation can be found on the [[official home page>>url:http://git-scm.com/documentation||shape="rect"]], which mentions books, videos, and links to other tutorials and references.
	3	+More in-depth Git documentation can be found on the [[official home page>>url:http://git-scm.com/documentation||shape="rect"]], which mentions books, videos, and links to other tutorials and references. Furthermore, the shell command {{code language="none"}}git help{{/code}} lists the most commonly used Git commands, and {{code language="none"}}git help <command>{{/code}} gives very detailed documentation for the specified Git command.
4	4
5	5	==== Contents ====
6	6
...	...	@@ -10,8 +10,10 @@
10	10
11	11	= Creating Commits =
12	12
	13	+Most steps of this tutorial are done by typing shell commands. The grey boxes contain the commands you should enter, preceded by a {{code language="none"}}${{/code}} symbol, and followed by their output. While you may copy & paste these commands, some of them may require modifications to adapt them to your own projects. The output will be slightly different for many commands when you enter them, since it also depends on parameters such as the user name and time of execution.
	14	+
13	13	1. Read the [[Git for Computer Scientists>>url:http://eagain.net/articles/git-for-computer-scientists/||shape="rect"]] introduction (skip this if you are already familiar with Git).
14		-1. For Linux, Git is available in its own package. Windows users can install [[msysGit>>url:http://msysgit.github.com/||shape="rect"]]. For MacOS, Git is available as part of [[Xcode>>url:https://developer.apple.com/xcode/||shape="rect"]]; if you cannot install that, use [[Git for OSX>>url:http://code.google.com/p/git-osx-installer/||shape="rect"]].
	16	+1. For Linux, Git is available in its own package. Windows users can install [[msysGit>>url:http://msysgit.github.com/||shape="rect"]]. For Mac OSX, Git is available as part of [[Xcode>>url:https://developer.apple.com/xcode/||shape="rect"]]; if you cannot install that, use [[Git for OSX>>url:http://code.google.com/p/git-osx-installer/||shape="rect"]].
15	15	1. (((
16	16	Configure your name and email address (will be included in all commits you create):
17	17
...	...	@@ -30,7 +30,7 @@
30	30	Initialized empty Git repository in ~/turing/.git/
31	31	{{/noformat}}
32	32
33		-The {{code language="none"}}.git{{/code}} subdirectory contains all history and metadata of the repository. You should not modify it.
	35	+The {{code language="none"}}.git{{/code}} subdirectory contains all history and metadata of the repository. You should not modify it. The {{code language="none"}}turing{{/code}} directory contains the //working copy//, that is the currently checked-out snapshot. You work by modifying your working copy and committing the modifications to the repository (contained in {{code language="none"}}.git{{/code}}).
34	34	)))
35	35	1. (((
36	36	Add and commit some content: copy [[attach:notes.txt]]{{code language="none"}}{{/code}} to your {{code language="none"}}turing{{/code}} directory.
...	...	@@ -126,7 +126,7 @@
126	126	+ * The head is controlled by a finite state machine
127	127	{{/noformat}}
128	128
129		-Note that each commit is identified by a looong hash value, but it is possible to use only a prefix when referencing them (if the prefix is not ambiguous): the example above uses {{code language="none"}}52e2d49{{/code}} to identify the second commit. The commit hashes in your repository will be different from those seen in this tutorial, because the name of the author and the exact time of committing is also considered in the hash calculation. Also try the command {{code language="none"}}gitk{{/code}} to get an overview of your commits (a better alternative available for MacOS is [[GitX>>url:http://gitx.frim.nl/||shape="rect"]]).
	131	+Note that each commit is identified by a looong hash value, but it is possible to use only a prefix when referencing them (if the prefix is not ambiguous): the example above uses {{code language="none"}}52e2d49{{/code}} to identify the second commit. The commit hashes in your repository will be different from those seen in this tutorial, because the name of the author and the exact time of committing is also considered in the hash calculation. Also try the command {{code language="none"}}gitk{{/code}} to get an overview of your commits (a better alternative available for Mac OSX is [[GitX>>url:http://gitx.frim.nl/||shape="rect"]]).
130	130
131	131	= Branching and Merging =
132	132
...	...	@@ -203,7 +203,7 @@
203	203	{{/noformat}}
204	204	)))
205	205	1. (((
206		-Switch back to the {{code language="none"}}sketches{{/code}} branch and commit something there. Note that the {{code language="none"}}checkout{{/code}} command modifies your working copy, hence you have to update your text editor's content if you opened one of the files.
	208	+Switch back to the {{code language="none"}}sketches{{/code}} branch and modify it as shown below. Note that the {{code language="none"}}checkout{{/code}} command modifies your working copy, hence you have to update your text editor's content if you opened one of the files.
207	207
208	208	{{noformat}}
209	209	$ git checkout sketches
...	...	@@ -219,7 +219,7 @@
219	219	1 files changed, 5 insertions(+), 0 deletions(-)
220	220	{{/noformat}}
221	221
222		-Now our two branches have //diverged//, which means that they cannot be fast-forwarded anymore.
	224	+Now your two branches have //diverged//, which means that they cannot be fast-forwarded anymore.
223	223	)))
224	224	1. (((
225	225	Merge the {{code language="none"}}master{{/code}} branch into {{code language="none"}}sketches{{/code}}:
...	...	@@ -243,8 +243,8 @@
243	243	* The finite state machine has an initial state and one or more final states
244	244	{{/noformat}}
245	245	)))
246		-1. Commit the change to {{code language="none"}}notes.txt{{/code}}.
247		-1. Check out {{code language="none"}}sketches{{/code}} (make sure to refresh your text editor so {{code language="none"}}notes.txt{{/code}} is reset to its previous state, without the change made above).
	248	+1. Commit the change of {{code language="none"}}notes.txt{{/code}}.
	249	+1. Check out {{code language="none"}}sketches{{/code}} (make sure to refresh your text editor so that {{code language="none"}}notes.txt{{/code}} is reset to its previous state, without the change made above).
248	248	1. (((
249	249	Insert the following line after line 4 of {{code language="none"}}notes.txt{{/code}}:
250	250
...	...	@@ -252,7 +252,7 @@
252	252	* Each state transition can trigger head movement and data read/write
253	253	{{/noformat}}
254	254	)))
255		-1. Commit the change to {{code language="none"}}notes.txt{{/code}}.
	257	+1. Commit the change of {{code language="none"}}notes.txt{{/code}}.
256	256	)))
257	257	1. (((
258	258	Merge the {{code language="none"}}master{{/code}} branch into the current branch ({{code language="none"}}sketches{{/code}}):
...	...	@@ -332,6 +332,8 @@
332	332
333	333	In the previous sections you have worked only with a local repository. The next step is to share this content with a remote repository. Later we will use [[Stash>>url:https://www.atlassian.com/software/stash/overview||shape="rect"]] for repository management, but we need to create group accounts for you first, thus you will use another system called [[Gitorious>>url:https://git.rtsys.informatik.uni-kiel.de/||shape="rect"]] for now.
334	334
	337	+Usually it is sufficient to have only one local copy of a Git repository. However, in this tutorial you will create a second copy in order to "simulate" what can happen if two users access the same remote repository: imagine the directories {{code language="none"}}turing{{/code}} and {{code language="none"}}turing2{{/code}} are each managed by a different user. You will simulate the resulting interference by switching your working directory between these two.
	338	+
335	335	1. Register to the Gitorious system: [[https:~~/~~/git.rtsys.informatik.uni-kiel.de/>>url:https://git.rtsys.informatik.uni-kiel.de/||shape="rect"]] (use your //Institut für Informatik// login name and email address)
336	336	1. Go to your //Dashboard// → //Manage SSH keys// → //Add SSH key//
337	337	1. Copy & paste the content of your public SSH key.\\
...	...	@@ -338,7 +338,9 @@
338	338	1*. If you don't have an SSH key: use the shell command {{code language="none"}}ssh-keygen{{/code}}, confirm the default destination file {{code language="none"}}~/.ssh/id_rsa{{/code}}, and choose whether to give a passphrase. If you have a passphrase, you need to enter it whenever you use your SSH key for the first time in a session. You can omit the passphrase, but that makes the key less secure. As result, the tool generates a private key {{code language="none"}}~/.ssh/id_rsa{{/code}}, which has to be kept secret, and a public key {{code language="none"}}~/.ssh/id_rsa.pub{{/code}}.
339	339	1. Go to //Projects// → //Create a new project// and call it "personal-<login>", replacing <login> with your own login name.
340	340	1. On the next page, create a repository named "turing" (or select //Add repository// on your project page).
341		-1. Once you are on the repository page, copy the URL shown in //Clone & push urls//.
	345	+1. On the repository page, go to //Manage collaborators// → //Add collaborators// and add the user msp.
	346	+1. Once you are back on the repository page, copy the URL shown in //Clone & push urls//.
	347	+1. Email the copied URL to [[msp@informatik.uni-kiel.de>>mailto:msp@informatik.uni-kiel.de||shape="rect"]]. This will serve as proof for your work on this tutorial.
342	342	1. (((
343	343	Transfer your {{code language="none"}}master{{/code}} branch to the new server-side repository. Replace the URL in the following command by the one copied from Gitorious:
344	344

Confluence.Code.ConfluencePageClass[0]

Id

...	...	@@ -1,1 +1,1 @@
1		-2982151
	1	+2982161

URL

...	...	@@ -1,1 +1,1 @@
1		-https://rtsys.informatik.uni-kiel.de/confluence//wiki/spaces/WS12EclPract/pages/2982151/Git
	1	+https://rtsys.informatik.uni-kiel.de/confluence//wiki/spaces/WS12EclPract/pages/2982161/Git