Changes for page Git

Last modified by Richard Kreissig on 2025/01/30 12:03
<
From version < 26.1 >
edited by msp
on 2012/10/15 14:53
To version < 29.1 >
edited by msp
on 2012/10/15 15:42
>
Change comment: There is no comment for this version

Summary

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,6 +7,14 @@
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. (((
10 10  Create a local repository for the "//Turing Project//":
11 11  
12 12  {{noformat}}
... ... @@ -15,9 +15,11 @@
15 15  $ git init
16 16  Initialized empty Git repository in ~/turing/.git/
17 17  {{/noformat}}
26 +
27 +The {{code language="none"}}.git{{/code}} subdirectory contains all history and metadata of the repository. You should not modify it.
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.
30 +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
... ... @@ -26,18 +26,51 @@
26 26   1 files changed, 5 insertions(+), 0 deletions(-)
27 27   create mode 100644 notes.txt
28 28  {{/noformat}}
39 +
40 +The file is now stored in the local history of your repository.
29 29  )))
30 30  1. Edit {{code language="none"}}notes.txt{{/code}}:\\
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:
46 +View the status of your current working copy:
35 35  
36 36  {{noformat}}
49 +$ git status
50 +# On branch master
51 +# Changed but not updated:
52 +# (use "git add <file>..." to update what will be committed)
53 +# (use "git checkout -- <file>..." to discard changes in working directory)
54 +#
55 +# modified: notes.txt
56 +#
57 +no changes added to commit (use "git add" and/or "git commit -a")
58 +{{/noformat}}
59 +)))
60 +1. (((
61 +Mark the modified file to include it in the next commit, then view the status again and compare with the previous output:
62 +
63 +{{noformat}}
37 37  $ git add notes.txt
65 +$ git status
66 +# On branch master
67 +# Changes to be committed:
68 +# (use "git reset HEAD <file>..." to unstage)
69 +#
70 +# modified: notes.txt
71 +#
72 +{{/noformat}}
73 +)))
74 +1. (((
75 +Commit the modified content to your local repository and view the status:
76 +
77 +{{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
79 +[master 52e2d49] modified tape length, found a controller for tape head
40 40   1 files changed, 2 insertions(+), 2 deletions(-)
81 +$ git status
82 +# On branch master
83 +nothing to commit (working directory clean)
41 41  {{/noformat}}
42 42  )))
43 43  
... ... @@ -45,9 +45,9 @@
45 45  
46 46  {{noformat}}
47 47  $ git log
48 -commit 3f28a0e473bf3da4aff34a09fed838fe033f3bb5
91 +commit 52e2d4946791c2725015853e5e261ce143c6fe8a
49 49  Author: Miro Spoenemann <msp@informatik.uni-kiel.de>
50 -Date: Mon Oct 15 14:30:24 2012 +0200
93 +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
103 +$ git show 52e2d49
104 +commit 52e2d4946791c2725015853e5e261ce143c6fe8a
62 62  Author: Miro Spoenemann <msp@informatik.uni-kiel.de>
63 -Date: Mon Oct 15 14:30:24 2012 +0200
106 +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,51 @@
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"]]).
123 +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"]]).
124 +
125 += Branching and Merging =
126 +
127 +In the previous section you have created two commits on the default branch, which is named {{code language="none"}}master{{/code}}. Now you will create a new branch and commit there, thus adding complexity to the commit graph.
128 +
129 +1. (((
130 +Create a branch with name //sketches//:
131 +
132 +{{noformat}}
133 +$ git branch sketches
134 +{{/noformat}}
135 +)))
136 +1. (((
137 +View the list of branches:
138 +
139 +{{noformat}}
140 +$ git branch
141 +* master
142 + sketches
143 +{{/noformat}}
144 +
145 +The star reveals that you are still on the old {{code language="none"}}master{{/code}} branch.
146 +)))
147 +1. (((
148 +Switch to the new branch:
149 +
150 +{{noformat}}
151 +$ git checkout sketches
152 +Switched to branch 'sketches'
153 +$ git branch
154 + master
155 +* sketches
156 +{{/noformat}}
157 +
158 +It is also possible to create a branch and switch immediately to it using the option {{code language="none"}}-b{{/code}} of {{code language="none"}}git checkout{{/code}}.
159 +)))
160 +1. (((
161 +Add the new file [[attach:examples.txt]]:
162 +
163 +{{noformat}}
164 +$ git add examples.txt
165 +$ git commit -m "wrote first examples"
166 +[sketches cd63135] wrote first examples
167 + 1 files changed, 20 insertions(+), 0 deletions(-)
168 + create mode 100644 examples.txt
169 +{{/noformat}}
170 +)))
Confluence.Code.ConfluencePageClass[0]
Id
... ... @@ -1,1 +1,1 @@
1 -2982120
1 +2982132
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/2982132/Git

Navigation

Quick Links

KIELER on GitHub
RTSYS Homepage