Summary

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

Details

Page properties

Content

...	...	@@ -17,7 +17,7 @@
17	17	{{/noformat}}
18	18	)))
19	19	1. (((
20		-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.
21	21
22	22	{{noformat}}
23	23	$ git add notes.txt
...	...	@@ -31,12 +31,40 @@
31	31	11. Replace "fixed" with "infinite" in line 1.
32	32	11. Replace "... (TODO)" with "a finite state machine" in line 4.
33	33	1. (((
34		-Commit the modified content to your local repository:
	34	+View the status of your current working copy:
35	35
36	36	{{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}}
37	37	$ 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}}
38	38	$ git commit -m "modified tape length, found a controller for tape head"
39		-[master 3f28a0e] modified tape length, found a controller for tape head
	67	+[master 52e2d49] modified tape length, found a controller for tape head
40	40	1 files changed, 2 insertions(+), 2 deletions(-)
41	41	{{/noformat}}
42	42	)))
...	...	@@ -45,9 +45,9 @@
45	45
46	46	{{noformat}}
47	47	$ git log
48		-commit 3f28a0e473bf3da4aff34a09fed838fe033f3bb5
	76	+commit 52e2d4946791c2725015853e5e261ce143c6fe8a
49	49	Author: Miro Spoenemann <msp@informatik.uni-kiel.de>
50		-Date: Mon Oct 15 14:30:24 2012 +0200
	78	+Date: Mon Oct 15 15:00:14 2012 +0200
51	51
52	52	modified tape length, found a controller for tape head
53	53
...	...	@@ -57,10 +57,10 @@
57	57
58	58	wrote some first notes
59	59
60		-$ git show 3f28a0e
61		-commit 3f28a0e473bf3da4aff34a09fed838fe033f3bb5
	88	+$ $ git show 52e2d49
	89	+commit 52e2d4946791c2725015853e5e261ce143c6fe8a
62	62	Author: Miro Spoenemann <msp@informatik.uni-kiel.de>
63		-Date: Mon Oct 15 14:30:24 2012 +0200
	91	+Date: Mon Oct 15 15:00:14 2012 +0200
64	64
65	65	modified tape length, found a controller for tape head
66	66
...	...	@@ -77,4 +77,4 @@
77	77	+ * The head is controlled by a finite state machine
78	78	{{/noformat}}
79	79
80		-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. 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"]]).
	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		-2982120
	1	+2982123

URL

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