Summary

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

Details

Page properties

Content

...	...	@@ -15,26 +15,9 @@
15	15	$ git init
16	16	Initialized empty Git repository in ~/turing/.git/
17	17	{{/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}}
35	35	)))
36	36	1. (((
37		-Add some content: copy [[attach:notes.txt]]{{code language="none"}}{{/code}} to your {{code language="none"}}turing{{/code}} directory.
	20	+Add and commit some content: copy [[attach:notes.txt]]{{code language="none"}}{{/code}} to your {{code language="none"}}turing{{/code}} directory.
38	38
39	39	{{noformat}}
40	40	$ git add notes.txt
...	...	@@ -48,23 +48,51 @@
48	48	11. Replace "fixed" with "infinite" in line 1.
49	49	11. Replace "... (TODO)" with "a finite state machine" in line 4.
50	50	1. (((
51		-Commit the modified content to your local repository:
	34	+View the status of your current working copy:
52	52
53	53	{{noformat}}
	37	+$ git status
	38	+# On branch master
	39	+# Changed but not updated:
	40	+# (use "git add <file>..." to update what will be committed)
	41	+# (use "git checkout -- <file>..." to discard changes in working directory)
	42	+#
	43	+# modified: notes.txt
	44	+#
	45	+no changes added to commit (use "git add" and/or "git commit -a")
	46	+{{/noformat}}
	47	+)))
	48	+1. (((
	49	+Mark the modified file to include it in the next commit, then view the status again and compare with the previous output:
	50	+
	51	+{{noformat}}
54	54	$ git add notes.txt
	53	+$ git status
	54	+# On branch master
	55	+# Changes to be committed:
	56	+# (use "git reset HEAD <file>..." to unstage)
	57	+#
	58	+# modified: notes.txt
	59	+#
	60	+{{/noformat}}
	61	+)))
	62	+1. (((
	63	+Commit the modified content to your local repository:
	64	+
	65	+{{noformat}}
55	55	$ git commit -m "modified tape length, found a controller for tape head"
56		-[master 3f28a0e] modified tape length, found a controller for tape head
	67	+[master 52e2d49] modified tape length, found a controller for tape head
57	57	1 files changed, 2 insertions(+), 2 deletions(-)
58	58	{{/noformat}}
59	59	)))
60	60
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:
	72	+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:
62	62
63	63	{{noformat}}
64	64	$ git log
65		-commit 3f28a0e473bf3da4aff34a09fed838fe033f3bb5
	76	+commit 52e2d4946791c2725015853e5e261ce143c6fe8a
66	66	Author: Miro Spoenemann <msp@informatik.uni-kiel.de>
67		-Date: Mon Oct 15 14:30:24 2012 +0200
	78	+Date: Mon Oct 15 15:00:14 2012 +0200
68	68
69	69	modified tape length, found a controller for tape head
70	70
...	...	@@ -74,10 +74,10 @@
74	74
75	75	wrote some first notes
76	76
77		-$ git show 3f28a0e
78		-commit 3f28a0e473bf3da4aff34a09fed838fe033f3bb5
	88	+$ $ git show 52e2d49
	89	+commit 52e2d4946791c2725015853e5e261ce143c6fe8a
79	79	Author: Miro Spoenemann <msp@informatik.uni-kiel.de>
80		-Date: Mon Oct 15 14:30:24 2012 +0200
	91	+Date: Mon Oct 15 15:00:14 2012 +0200
81	81
82	82	modified tape length, found a controller for tape head
83	83
...	...	@@ -94,4 +94,4 @@
94	94	+ * The head is controlled by a finite state machine
95	95	{{/noformat}}
96	96
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.
	108	+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"]]).

Confluence.Code.ConfluencePageClass[0]

Id

...	...	@@ -1,1 +1,1 @@
1		-2982118
	1	+2982123

URL

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