Changes for page Git

Last modified by Richard Kreissig on 2025/01/30 12:03
<
From version < 25.1 >
edited by msp
on 2012/10/15 14:48
To version < 28.1 >
edited by msp
on 2012/10/15 15:18
>
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,34 +7,25 @@
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 -Create a local repository for the "//Turing Project//":
10 +Configure your name and email address (will be included in all commits you create):
11 11  
12 12  {{noformat}}
13 -$ mkdir turing
14 -$ cd turing
15 -$ git init
16 -Initialized empty Git repository in ~/turing/.git/
13 +$ git config --global --add user.name "Your Name"
14 +$ git config --global --add user.email "<login>@informatik.uni-kiel.de"
17 17  {{/noformat}}
16 +)))
17 +1. (((
18 +Create a local repository for the "//Turing Project//":
18 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"}}
20 +{{noformat}}
30 30  $ mkdir turing
31 31  $ cd turing
32 32  $ git init
33 33  Initialized empty Git repository in ~/turing/.git/
34 -{{/code}}
25 +{{/noformat}}
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.
28 +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,54 @@
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:
42 +View the status of your current working copy:
52 52  
53 53  {{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}}
54 54  $ 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}}
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
75 +[master 52e2d49] modified tape length, found a controller for tape head
57 57   1 files changed, 2 insertions(+), 2 deletions(-)
77 +$ git status
78 +# On branch master
79 +nothing to commit (working directory clean)
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:
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:
62 62  
63 63  {{noformat}}
64 64  $ git log
65 -commit 3f28a0e473bf3da4aff34a09fed838fe033f3bb5
87 +commit 52e2d4946791c2725015853e5e261ce143c6fe8a
66 66  Author: Miro Spoenemann <msp@informatik.uni-kiel.de>
67 -Date: Mon Oct 15 14:30:24 2012 +0200
89 +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
99 +$ git show 52e2d49
100 +commit 52e2d4946791c2725015853e5e261ce143c6fe8a
79 79  Author: Miro Spoenemann <msp@informatik.uni-kiel.de>
80 -Date: Mon Oct 15 14:30:24 2012 +0200
102 +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.
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.
Confluence.Code.ConfluencePageClass[0]
Id
... ... @@ -1,1 +1,1 @@
1 -2982118
1 +2982126
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/2982126/Git

Navigation

Quick Links

KIELER on GitHub
RTSYS Homepage