Summary

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

Details

Page properties

Content

...	...	@@ -10,8 +10,6 @@
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		-
15	15	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).
16	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"]].
17	17	1. (((
...	...	@@ -128,7 +128,7 @@
128	128	+ * The head is controlled by a finite state machine
129	129	{{/noformat}}
130	130
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"]]).
	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"]]).
132	132
133	133	= Branching and Merging =
134	134
...	...	@@ -205,7 +205,7 @@
205	205	{{/noformat}}
206	206	)))
207	207	1. (((
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.
	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.
209	209
210	210	{{noformat}}
211	211	$ git checkout sketches
...	...	@@ -221,7 +221,7 @@
221	221	1 files changed, 5 insertions(+), 0 deletions(-)
222	222	{{/noformat}}
223	223
224		-Now your two branches have //diverged//, which means that they cannot be fast-forwarded anymore.
	222	+Now our two branches have //diverged//, which means that they cannot be fast-forwarded anymore.
225	225	)))
226	226	1. (((
227	227	Merge the {{code language="none"}}master{{/code}} branch into {{code language="none"}}sketches{{/code}}:
...	...	@@ -245,8 +245,8 @@
245	245	* The finite state machine has an initial state and one or more final states
246	246	{{/noformat}}
247	247	)))
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).
	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).
250	250	1. (((
251	251	Insert the following line after line 4 of {{code language="none"}}notes.txt{{/code}}:
252	252
...	...	@@ -254,7 +254,7 @@
254	254	* Each state transition can trigger head movement and data read/write
255	255	{{/noformat}}
256	256	)))
257		-1. Commit the change of {{code language="none"}}notes.txt{{/code}}.
	255	+1. Commit the change to {{code language="none"}}notes.txt{{/code}}.
258	258	)))
259	259	1. (((
260	260	Merge the {{code language="none"}}master{{/code}} branch into the current branch ({{code language="none"}}sketches{{/code}}):
...	...	@@ -334,8 +334,6 @@
334	334
335	335	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.
336	336
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		-
339	339	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)
340	340	1. Go to your //Dashboard// → //Manage SSH keys// → //Add SSH key//
341	341	1. Copy & paste the content of your public SSH key.\\

Confluence.Code.ConfluencePageClass[0]

Id

...	...	@@ -1,1 +1,1 @@
1		-2982159
	1	+2982155

URL

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