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 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.
4	4
5	5	= Creating Commits =
6	6
...	...	@@ -7,14 +7,6 @@
7	7	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).
8	8	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"]].
9	9	1. (((
10		-Configure your name and email address (will be included in all commits you create):
11		-
12		-{{noformat}}
13		-$ git config --global --add user.name "Your Name"
14		-$ git config --global --add user.email "<login>@informatik.uni-kiel.de"
15		-{{/noformat}}
16		-)))
17		-1. (((
18	18	Create a local repository for the "//Turing Project//":
19	19
20	20	{{noformat}}
...	...	@@ -23,9 +23,26 @@
23	23	$ git init
24	24	Initialized empty Git repository in ~/turing/.git/
25	25	{{/noformat}}
	18	+
	19	+{{panel}}
	20	+**$ mkdir turing**{{code language="none"}}{{/code}}
	21	+
	22	+**$ cd turing**{{code language="none"}}{{/code}}
	23	+
	24	+**$ git init**{{code language="none"}}{{/code}}
	25	+
	26	+{{code language="none"}}Initialized empty Git repository in ~/turing/.git/{{/code}}
	27	+{{/panel}}
	28	+
	29	+{{code language="bash"}}
	30	+$ mkdir turing
	31	+$ cd turing
	32	+$ git init
	33	+Initialized empty Git repository in ~/turing/.git/
	34	+{{/code}}
26	26	)))
27	27	1. (((
28		-Add and commit some content: copy [[attach:notes.txt]]{{code language="none"}}{{/code}} to your {{code language="none"}}turing{{/code}} directory.
	37	+Add some content: copy [[attach:notes.txt]]{{code language="none"}}{{/code}} to your {{code language="none"}}turing{{/code}} directory.
29	29
30	30	{{noformat}}
31	31	$ git add notes.txt
...	...	@@ -39,54 +39,23 @@
39	39	11. Replace "fixed" with "infinite" in line 1.
40	40	11. Replace "... (TODO)" with "a finite state machine" in line 4.
41	41	1. (((
42		-View the status of your current working copy:
	51	+Commit the modified content to your local repository:
43	43
44	44	{{noformat}}
45		-$ git status
46		-# On branch master
47		-# Changed but not updated:
48		-# (use "git add <file>..." to update what will be committed)
49		-# (use "git checkout -- <file>..." to discard changes in working directory)
50		-#
51		-# modified: notes.txt
52		-#
53		-no changes added to commit (use "git add" and/or "git commit -a")
54		-{{/noformat}}
55		-)))
56		-1. (((
57		-Mark the modified file to include it in the next commit, then view the status again and compare with the previous output:
58		-
59		-{{noformat}}
60	60	$ git add notes.txt
61		-$ git status
62		-# On branch master
63		-# Changes to be committed:
64		-# (use "git reset HEAD <file>..." to unstage)
65		-#
66		-# modified: notes.txt
67		-#
68		-{{/noformat}}
69		-)))
70		-1. (((
71		-Commit the modified content to your local repository and view the status:
72		-
73		-{{noformat}}
74	74	$ git commit -m "modified tape length, found a controller for tape head"
75		-[master 52e2d49] modified tape length, found a controller for tape head
	56	+[master 3f28a0e] modified tape length, found a controller for tape head
76	76	1 files changed, 2 insertions(+), 2 deletions(-)
77		-$ git status
78		-# On branch master
79		-nothing to commit (working directory clean)
80	80	{{/noformat}}
81	81	)))
82	82
83		-After the preceding steps you have two commits in your local repository, each with one file in the index. You have different commands for viewing these commits:
	61	+After the preceding steps you have two commits in your local repository, each with one file in the index. You have different options for viewing these commits:
84	84
85	85	{{noformat}}
86	86	$ git log
87		-commit 52e2d4946791c2725015853e5e261ce143c6fe8a
	65	+commit 3f28a0e473bf3da4aff34a09fed838fe033f3bb5
88	88	Author: Miro Spoenemann <msp@informatik.uni-kiel.de>
89		-Date: Mon Oct 15 15:00:14 2012 +0200
	67	+Date: Mon Oct 15 14:30:24 2012 +0200
90	90
91	91	modified tape length, found a controller for tape head
92	92
...	...	@@ -96,10 +96,10 @@
96	96
97	97	wrote some first notes
98	98
99		-$ git show 52e2d49
100		-commit 52e2d4946791c2725015853e5e261ce143c6fe8a
	77	+$ git show 3f28a0e
	78	+commit 3f28a0e473bf3da4aff34a09fed838fe033f3bb5
101	101	Author: Miro Spoenemann <msp@informatik.uni-kiel.de>
102		-Date: Mon Oct 15 15:00:14 2012 +0200
	80	+Date: Mon Oct 15 14:30:24 2012 +0200
103	103
104	104	modified tape length, found a controller for tape head
105	105
...	...	@@ -116,4 +116,4 @@
116	116	+ * The head is controlled by a finite state machine
117	117	{{/noformat}}
118	118
119		-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. 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"]]). 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.
	97	+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"}}3f28a0e{{/code}} to identify the second commit.

Confluence.Code.ConfluencePageClass[0]

Id

...	...	@@ -1,1 +1,1 @@
1		-2982126
	1	+2982118

URL

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