Changes for page Git

Last modified by Richard Kreissig on 2025/01/30 12:03

From version < 29.1 >

edited by msp
on 2012/10/15 15:42

To version < 24.1 >

edited by msp
on 2012/10/15 14:46

Change comment: There is no comment for this version

Raw
Rendered

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 @@
  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"]].
--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.
++ 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.
  = Creating Commits =
@@ -7,14 +7,6 @@
 . 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).
 . 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"]].
 . (((
--Configure your name and email address (will be included in all commits you create):
--
--{{noformat}}
--$ git config --global --add user.name "Your Name"
--$ git config --global --add user.email "<login>@informatik.uni-kiel.de"
--{{/noformat}}
--)))
--1. (((
  Create a local repository for the "//Turing Project//":
  {{noformat}}
@@ -24,10 +24,12 @@
  Initialized empty Git repository in ~/turing/.git/
  {{/noformat}}
--The {{code language="none"}}.git{{/code}} subdirectory contains all history and metadata of the repository. You should not modify it.
++{{panel}}
++**$ mkdir turing $ cd turing $ git init**{{code language="none"}} Initialized empty Git repository in ~/turing/.git/{{/code}}
++{{/panel}}
  )))
 . (((
--Add and commit some content: copy [[attach:notes.txt]]{{code language="none"}}{{/code}} to your {{code language="none"}}turing{{/code}} directory.
++Add some content: copy [[attach:notes.txt]]{{code language="none"}}{{/code}} to your {{code language="none"}}turing{{/code}} directory.
  {{noformat}}
  $ git add notes.txt
@@ -36,61 +36,28 @@
 files changed, 5 insertions(+), 0 deletions(-)
   create mode 100644 notes.txt
  {{/noformat}}
--
--The file is now stored in the local history of your repository.
  )))
 . Edit {{code language="none"}}notes.txt{{/code}}:\\
 . Replace "fixed" with "infinite" in line 1.
 . Replace "... (TODO)" with "a finite state machine" in line 4.
 . (((
--View the status of your current working copy:
++Commit the modified content to your local repository:
  {{noformat}}
--$ git status
--# On branch master
--# Changed but not updated:
--#   (use "git add <file>..." to update what will be committed)
--#   (use "git checkout -- <file>..." to discard changes in working directory)
--#
--#       modified:   notes.txt
--#
--no changes added to commit (use "git add" and/or "git commit -a")
--{{/noformat}}
--)))
--1. (((
--Mark the modified file to include it in the next commit, then view the status again and compare with the previous output:
--
--{{noformat}}
  $ git add notes.txt
--$ git status
--# On branch master
--# Changes to be committed:
--#   (use "git reset HEAD <file>..." to unstage)
--#
--#       modified:   notes.txt
--#
--{{/noformat}}
--)))
--1. (((
--Commit the modified content to your local repository and view the status:
--
--{{noformat}}
  $ git commit -m "modified tape length, found a controller for tape head"
--[master 52e2d49] modified tape length, found a controller for tape head
++[master 3f28a0e] modified tape length, found a controller for tape head
 files changed, 2 insertions(+), 2 deletions(-)
--$ git status
--# On branch master
--nothing to commit (working directory clean)
  {{/noformat}}
  )))
--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:
++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:
  {{noformat}}
  $ git log
--commit 52e2d4946791c2725015853e5e261ce143c6fe8a
++commit 3f28a0e473bf3da4aff34a09fed838fe033f3bb5
  Author: Miro Spoenemann <msp@informatik.uni-kiel.de>
--Date:   Mon Oct 15 15:00:14 2012 +0200
++Date:   Mon Oct 15 14:30:24 2012 +0200
      modified tape length, found a controller for tape head
@@ -100,10 +100,10 @@
      wrote some first notes
--$ git show 52e2d49
--commit 52e2d4946791c2725015853e5e261ce143c6fe8a
++$ git show 3f28a0e
++commit 3f28a0e473bf3da4aff34a09fed838fe033f3bb5
  Author: Miro Spoenemann <msp@informatik.uni-kiel.de>
--Date:   Mon Oct 15 15:00:14 2012 +0200
++Date:   Mon Oct 15 14:30:24 2012 +0200
      modified tape length, found a controller for tape head
@@ -120,51 +120,4 @@
  + * The head is controlled by a finite state machine
  {{/noformat}}
--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"]]).
--
--= Branching and Merging =
--
--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.
--
--1. (((
--Create a branch with name //sketches//:
--
--{{noformat}}
--$ git branch sketches
--{{/noformat}}
--)))
--1. (((
--View the list of branches:
--
--{{noformat}}
--$ git branch
--* master
--  sketches
--{{/noformat}}
--
--The star reveals that you are still on the old {{code language="none"}}master{{/code}} branch.
--)))
--1. (((
--Switch to the new branch:
--
--{{noformat}}
--$ git checkout sketches
--Switched to branch 'sketches'
--$ git branch
--  master
--* sketches
--{{/noformat}}
--
--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}}.
--)))
--1. (((
--Add the new file [[attach:examples.txt]]:
--
--{{noformat}}
--$ git add examples.txt
--$ git commit -m "wrote first examples"
--[sketches cd63135] wrote first examples
-- 1 files changed, 20 insertions(+), 0 deletions(-)
-- create mode 100644 examples.txt
--{{/noformat}}
--)))
++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 @@
--2982132
++2982116

URL

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

Changes for page Git

Summary

Details

Navigation

Quick Links