Changes for page Git

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

From version < 30.1 >

edited by msp
on 2012/10/16 10:56

To version < 49.2

edited by Richard Kreissig
on 2025/01/30 12:03

Change comment: Update document after refactoring.

Raw
Rendered

Summary

Page properties (3 modified, 0 added, 0 removed)
Attachments (0 modified, 6 added, 0 removed)
Objects (1 modified, 0 added, 0 removed)
- Confluence.Code.ConfluencePageClass[0]

Details

Page properties

Parent

...	...	@@ -1,0 +1,1 @@
	1	+Projects.Archive.Eclipse Practical (winter term 201213).Tutorials.WebHome

Author

@@ -1,1 +1,1 @@
--XWiki.msp
++XWiki.stu230980

Content

@@ -1,51 +1,59 @@
  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 Git 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. Furthermore, the shell command {{code language="none"}}git help{{/code}} lists the most commonly used Git commands, and {{code language="none"}}git help <command>{{/code}} gives very detailed documentation for the specified Git command.
++=== Contents ===
++
++
++
++{{toc maxLevel="2" style="circle"/}}
++
  = Creating Commits =
++Most steps of this tutorial are done by typing shell commands. The grey boxes contain the commands you should enter, preceded by a {{code language="none"}}${{/code}} symbol, and followed by their output. While you may copy & paste these commands, some of them may require modifications to adapt them to your own projects. The output will be slightly different for many commands when you enter them, since it also depends on parameters such as the user name and time of execution.
++
 . 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).
--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"]].
++1. For Linux, Git is available in its own package. Windows users can install [[msysGit>>url:http://msysgit.github.com/||shape="rect"]]. For Mac OSX, 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}}
++{{code}}
  $ git config --global --add user.name "Your Name"
  $ git config --global --add user.email "<login>@informatik.uni-kiel.de"
--{{/noformat}}
++{{/code}}
  )))
 . (((
  Create a local repository for the "//Turing Project//":
--{{noformat}}
++{{code}}
  $ mkdir turing
  $ cd turing
  $ git init
  Initialized empty Git repository in ~/turing/.git/
--{{/noformat}}
++{{/code}}
--The {{code language="none"}}.git{{/code}} subdirectory contains all history and metadata of the repository. You should not modify it.
++The {{code language="none"}}.git{{/code}} subdirectory contains all history and metadata of the repository. You should not modify it. The {{code language="none"}}turing{{/code}} directory contains the //working copy//, that is the currently checked-out snapshot. You work by modifying your working copy and committing the modifications to the repository (contained in {{code language="none"}}.git{{/code}}).
  )))
 . (((
  Add and commit some content: copy [[attach:notes.txt]]{{code language="none"}}{{/code}} to your {{code language="none"}}turing{{/code}} directory.
--{{noformat}}
++{{code}}
  $ git add notes.txt
  $ git commit -m "wrote some first notes"
  [master (root-commit) 2e73b34] wrote some first notes
 files changed, 5 insertions(+), 0 deletions(-)
   create mode 100644 notes.txt
--{{/noformat}}
++{{/code}}
  The file is now stored in the local history of your repository.
  )))
--1. Edit {{code language="none"}}notes.txt{{/code}}:\\
++1. 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:
--{{noformat}}
++{{code}}
  $ git status
  # On branch master
  # Changed but not updated:
@@ -55,12 +55,12 @@
  #       modified:   notes.txt
  #
  no changes added to commit (use "git add" and/or "git commit -a")
--{{/noformat}}
++{{/code}}
  )))
 . (((
  Mark the modified file to include it in the next commit, then view the status again and compare with the previous output:
--{{noformat}}
++{{code}}
  $ git add notes.txt
  $ git status
  # On branch master
@@ -69,12 +69,12 @@
  #
  #       modified:   notes.txt
  #
--{{/noformat}}
++{{/code}}
  )))
 . (((
  Commit the modified content to your local repository and view the status:
--{{noformat}}
++{{code}}
  $ git commit -m "modified tape length, found a controller for tape head"
  [master 52e2d49] modified tape length, found a controller for tape head
 files changed, 2 insertions(+), 2 deletions(-)
@@ -81,12 +81,12 @@
  $ git status
  # On branch master
  nothing to commit (working directory clean)
--{{/noformat}}
++{{/code}}
  )))
  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:
--{{noformat}}
++{{code}}
  $ git log
  commit 52e2d4946791c2725015853e5e261ce143c6fe8a
  Author: Miro Spoenemann <msp@informatik.uni-kiel.de>
@@ -118,29 +118,29 @@
    * Tape head can move left or right
  - * The head is controlled by ... (TODO)
  + * The head is controlled by a finite state machine
--{{/noformat}}
++{{/code}}
--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"]]).
++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 Mac OSX 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.
++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. In general, you may create as many local branches as you like, since they are simple to use and can be a great tool to structure your work.
 . (((
  Create a branch with name //sketches//:
--{{noformat}}
++{{code}}
  $ git branch sketches
--{{/noformat}}
++{{/code}}
  )))
 . (((
  View the list of branches:
--{{noformat}}
++{{code}}
  $ git branch
  * master
    sketches
--{{/noformat}}
++{{/code}}
  The star reveals that you are still on the old {{code language="none"}}master{{/code}} branch.
  )))
@@ -147,13 +147,13 @@
 . (((
  Switch to the new branch:
--{{noformat}}
++{{code}}
  $ git checkout sketches
  Switched to branch 'sketches'
  $ git branch
    master
  * sketches
--{{/noformat}}
++{{/code}}
  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}}.
  )))
@@ -160,13 +160,13 @@
 . (((
  Download and add the new file [[attach:examples.txt]]{{code language="none"}}{{/code}}:
--{{noformat}}
++{{code}}
  $ git add examples.txt
  $ git commit -m "wrote first examples"
  [sketches cd63135] wrote first examples
 files changed, 20 insertions(+), 0 deletions(-)
   create mode 100644 examples.txt
--{{/noformat}}
++{{/code}}
  Inspecting the commit graph with {{code language="none"}}gitk{{/code}} (or another graphical viewer) you see that the {{code language="none"}}sketches{{/code}} branch now has three commits, while {{code language="none"}}master{{/code}} is still at the second commit.
  )))
@@ -173,7 +173,7 @@
 . (((
  Merging the {{code language="none"}}sketches{{/code}} branch into {{code language="none"}}master{{/code}} means that all changes that have been made in {{code language="none"}}sketches{{/code}} are also applied to {{code language="none"}}master{{/code}}. In order to perform this merge, we have to check out the {{code language="none"}}master{{/code}} branch first:
--{{noformat}}
++{{code}}
  $ git checkout master
  Switched to branch 'master'
  $ git merge sketches
@@ -182,7 +182,7 @@
   examples.txt |   20 ++++++++++++++++++++
 files changed, 20 insertions(+), 0 deletions(-)
   create mode 100644 examples.txt
--{{/noformat}}
++{{/code}}
  This was a //fast-forward// merge: since the {{code language="none"}}master{{/code}} branch was completely contained in the {{code language="none"}}sketches{{/code}} branch, the merge could be done by simply changing the head pointer of {{code language="none"}}master{{/code}} to be the same as the head of {{code language="none"}}sketches{{/code}}.
  )))
@@ -189,74 +189,75 @@
 . (((
  Now add the line "{{code language="none"}}see some examples in 'examples.txt'{{/code}}" to the file {{code language="none"}}notes.txt{{/code}} and commit this change in the current branch:
--{{noformat}}
++{{code}}
  $ git add notes.txt
  $ git commit -m "added reference to the new examples"
  [master a5e244f] added reference to the new examples
 files changed, 2 insertions(+), 1 deletions(-)
--{{/noformat}}
++{{/code}}
  )))
 . (((
--Switch back to the {{code language="none"}}sketches{{/code}} branch and commit something there. Note that the {{code language="none"}}checkout{{/code}} command modifies your working copy, hence you have to update your text editor's content if you opened one of the files.
++Switch back to the {{code language="none"}}sketches{{/code}} branch and modify it as shown below. Note that the {{code language="none"}}checkout{{/code}} command modifies your working copy, hence you have to update your text editor's content if you opened one of the files.
--{{noformat}}
++{{code}}
  $ git checkout sketches
  Switched to branch 'sketches'
--{{/noformat}}
++{{/code}}
--Add the line "{{code language="none"}}Move one step left:{{/code}}" and write an updated version of the tape with tape head in the file {{code language="none"}}examples.txt{{/code}}, then commit.
++Add the line "{{code language="none"}}Move one step left:{{/code}}" followed by an accordingly updated version of the tape with tape head at the end of the file {{code language="none"}}examples.txt{{/code}}, then commit.
--{{noformat}}
++{{code}}
  $ git add examples.txt
  $ git commit -m "added another example"
  [sketches 55a9cb1] added another example
 files changed, 5 insertions(+), 0 deletions(-)
--{{/noformat}}
++{{/code}}
--Now our two branches have //diverged//, which means that they cannot be fast-forwarded anymore.
++Now your two branches have //diverged//, which means that they cannot be fast-forwarded anymore.
  )))
 . (((
  Merge the {{code language="none"}}master{{/code}} branch into {{code language="none"}}sketches{{/code}}:
--{{noformat}}
++{{code}}
  $ git merge master
  Merge made by recursive.
   notes.txt |    3 ++-
 files changed, 2 insertions(+), 1 deletions(-)
--{{/noformat}}
++{{/code}}
--Using {{code language="none"}}gitk{{/code}} you can see that a new commit was created that has two parent commits. Such a commit is called //merge// commit and is done automatically when a non-fast-forward merge is applied.
++Using {{code language="none"}}gitk{{/code}} you can see that a new commit was created that has two parent commits. Such a commit is called //merge// commit and is done automatically when a non-fast-forward merge is applied. See how both the change to {{code language="none"}}notes.txt{{/code}} done in the {{code language="none"}}master{{/code}} branch and the change to {{code language="none"}}examples.txt{{/code}} done in the {{code language="none"}}sketches{{/code}} branch are now contained in the repository state that results from the merge.
  )))
 . (((
  Add a commit in each of the two branches using the commands you have already learned.
++
 . Check out {{code language="none"}}master{{/code}}.
 . (((
  Insert the following line after line 4 of {{code language="none"}}notes.txt{{/code}}:
--{{noformat nopanel="true"}}
++{{code nopanel="true"}}
   * The finite state machine has an initial state and one or more final states
--{{/noformat}}
++{{/code}}
  )))
--1. Commit the change to {{code language="none"}}notes.txt{{/code}}.
--1. Check out {{code language="none"}}sketches{{/code}} (make sure to refresh your text editor so {{code language="none"}}notes.txt{{/code}} is reset to its previous state, without the change made above).
++1. Commit the change of {{code language="none"}}notes.txt{{/code}}.
++1. Check out {{code language="none"}}sketches{{/code}} (make sure to refresh your text editor so that {{code language="none"}}notes.txt{{/code}} is reset to its previous state, without the change made above).
 . (((
  Insert the following line after line 4 of {{code language="none"}}notes.txt{{/code}}:
--{{noformat nopanel="true"}}
++{{code nopanel="true"}}
   * Each state transition can trigger head movement and data read/write
--{{/noformat}}
++{{/code}}
  )))
--1. Commit the change to {{code language="none"}}notes.txt{{/code}}.
++1. Commit the change of {{code language="none"}}notes.txt{{/code}}.
  )))
 . (((
  Merge the {{code language="none"}}master{{/code}} branch into the current branch ({{code language="none"}}sketches{{/code}}):
--{{noformat}}
++{{code}}
  $ git merge master
  Auto-merging notes.txt
  CONFLICT (content): Merge conflict in notes.txt
  Automatic merge failed; fix conflicts and then commit the result.
--{{/noformat}}
++{{/code}}
  As expected, the branches could not be merged automatically, since both branches modified the same line in the same file.
  )))
@@ -263,7 +263,7 @@
 . (((
  Use the {{code language="none"}}status{{/code}} command to see the list of affected files:
--{{noformat}}
++{{code}}
  $ git status
  # On branch sketches
  # Unmerged paths:
@@ -272,18 +272,18 @@
  #       both modified:      notes.txt
  #
  no changes added to commit (use "git add" and/or "git commit -a")
--{{/noformat}}
++{{/code}}
  )))
 . (((
  The modified {{code language="none"}}notes.txt{{/code}} should now contain the following text:
--{{noformat nopanel="true"}}
++{{code nopanel="true"}}
  <<<<<<< HEAD
   * Each state transition can trigger head movement and data read/write
  =======
   * The finite state machine has an initial state and one or more final states
  >>>>>>> master
--{{/noformat}}
++{{/code}}
  The upper line is the one committed to {{code language="none"}}sketches{{/code}}, while the lower line was committed to {{code language="none"}}master{{/code}}. You have to resolve the conflict by editing the file. In this case the conflict is resolved by keeping both lines in arbitrary order, that means you should just remove the conflict markers (lines 5, 7, and 9 in {{code language="none"}}notes.txt{{/code}}).
  )))
@@ -290,7 +290,7 @@
 . (((
  Use the {{code language="none"}}add{{/code}} command to mark {{code language="none"}}notes.txt{{/code}} as resolved. Entering {{code language="none"}}git commit{{/code}} without a message will open a text editor with an automatically created commit message. Just close the editor, and the merge commit is completed:
--{{noformat}}
++{{code}}
  $ git commit
  [sketches 21d5ddb] Merge branch 'master' into sketches
  $ git show 21d5ddb
@@ -315,7 +315,7 @@
   + * Each state transition can trigger head movement and data read/write
  +  * The finite state machine has an initial state and one or more final states
    see some examples in 'examples.txt'
--{{/noformat}}
++{{/code}}
  )))
  The {{code language="none"}}gitk{{/code}} tool should now display this graph:
@@ -322,4 +322,379 @@
  [[image:attach:turing-graph-01.png]]
--
++= Remote Repositories =
++
++In the previous sections you have worked only with a local repository. The next step is to share this content with a remote repository. Later we will use [[Stash>>url:https://www.atlassian.com/software/stash/overview||shape="rect"]] for repository management, but we need to create group accounts for you first, thus you will use another system called [[Gitorious>>url:https://git.rtsys.informatik.uni-kiel.de/||shape="rect"]] for now.
++
++Usually it is sufficient to have only one local copy of a Git repository. However, in this tutorial you will create a second copy in order to "simulate" what can happen if two users access the same remote repository: imagine the directories {{code language="none"}}turing{{/code}} and {{code language="none"}}turing2{{/code}} are each managed by a different user. You will simulate the resulting interference by switching your working directory between these two.
++
++1. Register to the Gitorious system: [[https:~~/~~/git.rtsys.informatik.uni-kiel.de/>>url:https://git.rtsys.informatik.uni-kiel.de/||shape="rect"]] (use your //Institut für Informatik// login name and email address)
++1. Go to your //Dashboard// → //Manage SSH keys// → //Add SSH key//
++1. Copy & paste the content of your public SSH key.
++1*. If you don't have an SSH key: use the shell command {{code language="none"}}ssh-keygen{{/code}}, confirm the default destination file {{code language="none"}}~/.ssh/id_rsa{{/code}}, and choose whether to give a passphrase. If you have a passphrase, you need to enter it whenever you use your SSH key for the first time in a session. You can omit the passphrase, but that makes the key less secure. As result, the tool generates a private key {{code language="none"}}~/.ssh/id_rsa{{/code}}, which has to be kept secret, and a public key {{code language="none"}}~/.ssh/id_rsa.pub{{/code}}.
++1. Go to //Projects// → //Create a new project// and call it "personal-<login>", replacing <login> with your own login name.
++1. On the next page, create a repository named "turing" (or select //Add repository// on your project page).
++1. On the repository page, go to //Manage collaborators// → //Add collaborators// and add the user msp.
++1. Once you are back on the repository page, copy the URL shown in //Clone & push urls//.
++1. Email the copied URL to [[msp@informatik.uni-kiel.de>>mailto:msp@informatik.uni-kiel.de||shape="rect"]]. This will serve as proof for your work on this tutorial.
++1. (((
++Transfer your {{code language="none"}}master{{/code}} branch to the new server-side repository. Replace the URL in the following command by the one copied from Gitorious:
++
++{{code}}
++$ git remote add gitorious git@git.rtsys.informatik.uni-kiel.de:personal-msp/turing.git
++$ git push gitorious master
++Counting objects: 15, done.
++Delta compression using up to 16 threads.
++Compressing objects: 100% (13/13), done.
++Writing objects: 100% (15/15), 1.54 KiB, done.
++Total 15 (delta 3), reused 0 (delta 0)
++remote: => Syncing Gitorious... [OK]
++To git@git.rtsys.informatik.uni-kiel.de:personal-msp/turing.git
++ * [new branch]      master -> master
++{{/code}}
++
++The first command adds a //remote// named "gitorious" to your local repository, which is just a bookmark for the long URL. The second command transfers the {{code language="none"}}master{{/code}} branch to the server, which is called //pushing//. After that is done, reload the Gitorious page in your browser, and you see all changes that are transferred to the server-side repository.
++)))
++1. (((
++Create a local clone of your remote repository (replace the URL accordingly):
++
++{{code}}
++$ cd ..
++$ git clone git@git.rtsys.informatik.uni-kiel.de:personal-msp/turing.git turing2
++Initialized empty Git repository in /home/msp/tmp/turing2/.git/
++remote: Counting objects: 15, done.
++remote: Compressing objects: 100% (13/13), done.
++remote: Total 15 (delta 3), reused 0 (delta 0)
++Receiving objects: 100% (15/15), done.
++Resolving deltas: 100% (3/3), done.
++$ cd turing2
++{{/code}}
++
++The {{code language="none"}}clone{{/code}} command automatically creates a remote named {{code language="none"}}origin{{/code}} in the new local repository, which is set to the given URL. You will use this second clone to simulate another user with access to the repository.
++)))
++1. Edit the file {{code language="none"}}examples.txt{{/code}} in the new clone ({{code language="none"}}turing2{{/code}}): replace {{code language="none"}}"a"{{/code}} in line 6 by {{code language="none"}}"c"{{/code}} and correct the tape representations in lines 9, 14, and 19 accordingly. Commit the change.
++1. (((
++Push the new commit to the server:
++
++{{code}}
++$ git push
++Counting objects: 5, done.
++Delta compression using up to 16 threads.
++Compressing objects: 100% (3/3), done.
++Writing objects: 100% (3/3), 362 bytes, done.
++Total 3 (delta 1), reused 0 (delta 0)
++remote: => Syncing Gitorious... [OK]
++To git@git.rtsys.informatik.uni-kiel.de:personal-msp/turing.git
++   8af2d50..1d1577f  master -> master
++{{/code}}
++
++In this case the push command can be used without arguments, which means that it pushes all branches as configured in {{code language="none"}}.git/config{{/code}}:
++
++{{code}}
++$ more .git/config
++[core]
++        repositoryformatversion = 0
++        filemode = true
++        bare = false
++        logallrefupdates = true
++[remote "origin"]
++        fetch = +refs/heads/*:refs/remotes/origin/*
++        url = git@git.rtsys.informatik.uni-kiel.de:personal-msp/turing.git
++[branch "master"]
++        remote = origin
++        merge = refs/heads/master
++{{/code}}
++
++Here the branch {{code language="none"}}master{{/code}} is linked with the remote {{code language="none"}}origin{{/code}}, hence {{code language="none"}}git push{{/code}} does the same as {{code language="none"}}git push origin master{{/code}}.
++)))
++1. (((
++Go back to the original local repository and check out the {{code language="none"}}master{{/code}} branch:
++
++{{code}}
++$ cd ../turing
++$ git checkout master
++Switched to branch 'master'
++{{/code}}
++)))
++1. (((
++Merge the {{code language="none"}}sketches{{/code}} branch into {{code language="none"}}master{{/code}}:
++
++{{code}}
++$ git merge sketches
++Updating 8af2d50..21d5ddb
++Fast-forward
++ examples.txt |    5 +++++
++ notes.txt    |    1 +
++ 2 files changed, 6 insertions(+), 0 deletions(-)
++{{/code}}
++
++Now your local {{code language="none"}}master{{/code}} branch and the one on the server-side repository have diverged
++)))
++1. (((
++Fetch the server-side changes:
++
++{{code}}
++$ git fetch gitorious
++remote: Counting objects: 5, done.
++remote: Compressing objects: 100% (3/3), done.
++remote: Total 3 (delta 1), reused 0 (delta 0)
++Unpacking objects: 100% (3/3), done.
++From git.rtsys.informatik.uni-kiel.de:personal-msp/turing
++   8af2d50..1d1577f  master     -> gitorious/master
++{{/code}}
++
++Now the change to {{code language="none"}}examples.txt{{/code}} that was previously committed in the {{code language="none"}}turing2{{/code}} repository is stored in a //remote tracking branch// named {{code language="none"}}gitorious/master{{/code}}:
++
++{{code}}
++$ git branch -a
++* master
++  sketches
++  remotes/gitorious/master
++{{/code}}
++
++You can analyze the remote tracking branch using the {{code language="none"}}log{{/code}} and {{code language="none"}}show{{/code}} commands. However, you should never directly modify a remote tracking branch.
++)))
++1. (((
++You can merge the remote changes into your local {{code language="none"}}master{{/code}} branch with the following command:
++
++{{code}}
++$ git merge gitorious/master
++Auto-merging examples.txt
++Merge made by recursive.
++ examples.txt |    8 ++++----
++ 1 files changed, 4 insertions(+), 4 deletions(-)
++{{/code}}
++
++Since this combination of {{code language="none"}}fetch{{/code}} and {{code language="none"}}merge{{/code}} is used very often, Git offers a shortcut for it, namely the {{code language="none"}}pull{{/code}} command. In this case the according command would have been {{code language="none"}}git pull gitorious master{{/code}}.
++)))
++1. (((
++Push the merged branch to the server, and then push the {{code language="none"}}sketches{{/code}} branch, which is not on the server yet:
++
++{{code}}
++$ git push gitorious master
++Counting objects: 23, done.
++Delta compression using up to 16 threads.
++Compressing objects: 100% (14/14), done.
++Writing objects: 100% (14/14), 1.65 KiB, done.
++Total 14 (delta 4), reused 0 (delta 0)
++remote: => Syncing Gitorious... [OK]
++To git@git.rtsys.informatik.uni-kiel.de:personal-msp/turing.git
++   1d1577f..957f686  master -> master
++$ git push gitorious sketches
++Total 0 (delta 0), reused 0 (delta 0)
++remote: => Syncing Gitorious... [OK]
++To git@git.rtsys.informatik.uni-kiel.de:personal-msp/turing.git
++ * [new branch]      sketches -> sketches
++{{/code}}
++)))
++1. (((
++As next step change your working directory to the second local repository {{code language="none"}}turing2{{/code}}, add the following line to the end of {{code language="none"}}notes.txt{{/code}} in the {{code language="none"}}turing2{{/code}} directory, and commit the change:
++
++{{code nopanel="true"}}
++TODO: formal definition
++{{/code}}
++)))
++1. (((
++Trying to push this commit to the server results in the following error message:
++
++{{code}}
++$ git push
++To git@git.rtsys.informatik.uni-kiel.de:personal-msp/turing.git
++ ! [rejected]        master -> master (non-fast-forward)
++error: failed to push some refs to 'git@git.rtsys.informatik.uni-kiel.de:personal-msp/turing.git'
++To prevent you from losing history, non-fast-forward updates were rejected
++Merge the remote changes before pushing again.  See the 'Note about
++fast-forwards' section of 'git push --help' for details.
++{{/code}}
++
++This is because you have modified the branch while working in the original {{code language="none"}}turing{{/code}} repository, and these changes have to be merged with the new commit you have just made for {{code language="none"}}notes.txt{{/code}}.
++)))
++1. (((
++The solution is to apply the {{code language="none"}}pull{{/code}} command followed by the {{code language="none"}}push{{/code}} command:
++
++{{code}}
++$ git pull
++remote: Counting objects: 23, done.
++remote: Compressing objects: 100% (14/14), done.
++remote: Total 14 (delta 4), reused 0 (delta 0)
++Unpacking objects: 100% (14/14), done.
++From git.rtsys.informatik.uni-kiel.de:personal-msp/turing
++   1d1577f..957f686  master     -> origin/master
++ * [new branch]      sketches   -> origin/sketches
++Auto-merging notes.txt
++Merge made by recursive.
++ examples.txt |    5 +++++
++ notes.txt    |    1 +
++ 2 files changed, 6 insertions(+), 0 deletions(-)
++$ git push
++Counting objects: 10, done.
++Delta compression using up to 16 threads.
++Compressing objects: 100% (6/6), done.
++Writing objects: 100% (6/6), 673 bytes, done.
++Total 6 (delta 2), reused 0 (delta 0)
++remote: => Syncing Gitorious... [OK]
++To git@git.rtsys.informatik.uni-kiel.de:personal-msp/turing.git
++   957f686..b58ded7  master -> master
++{{/code}}
++
++While {{code language="none"}}pull{{/code}} performs a {{code language="none"}}fetch{{/code}} and a {{code language="none"}}merge{{/code}}, {{code language="none"}}push{{/code}} transfers the new merged branch to the server. Note that during the merge operation conflicts can occur. In that case you have to resolve them and commit the changes before you can push. When used without parameters like shown above, {{code language="none"}}pull{{/code}} lookes in {{code language="none"}}.git/config{{/code}} to determine which branches to pull from which remotes.
++)))
++1. (((
++In order to check out the {{code language="none"}}sketches{{/code}} branch locally, which was previously pushed to the server, simply type the following command:
++
++{{code}}
++$ git checkout sketches
++Branch sketches set up to track remote branch sketches from origin.
++Switched to a new branch 'sketches'
++{{/code}}
++
++This branch can be pushed and pulled with the server in the same way as you did for the {{code language="none"}}master{{/code}} branch. Never check out {{code language="none"}}origin/sketches{{/code}}, since that is a remote tracking branch!
++)))
++
++The {{code language="none"}}master{{/code}} branch should look like this:
++
++[[image:attach:turing-graph-02.png]]
++
++= Other Useful Commands =
++
++This section contains optional steps that you don't need to push online, but can be useful for you to learn.
++
++=== Ignoring Files ===
++
++While working on his Machine, Alan Turing has produced a temporary file {{code language="none"}}experiments.tmp{{/code}}, which he does not want to commit in the repository:
++
++{{code}}
++$ git status
++# On branch master
++# Untracked files:
++#   (use "git add <file>..." to include in what will be committed)
++#
++#       experiments.tmp
++nothing added to commit but untracked files present (use "git add" to track)
++{{/code}}
++
++Since the extra mention of that file can make Git's status reports unnecessarily cluttered, Alan wants to ignore it permanently. Help him by adding a {{code language="none"}}.gitignore{{/code}} file to the repository:
++
++{{code}}
++$ echo "*.tmp" > .gitignore
++$ git add .gitignore
++$ git commit -m "added ignore file"
++[master 738ce4c] added ignore file
++ 1 files changed, 1 insertions(+), 0 deletions(-)
++ create mode 100644 .gitignore
++$ git status
++# On branch master
++# Your branch is ahead of 'origin/master' by 1 commit.
++#
++nothing to commit (working directory clean)
++{{/code}}
++
++Now the experiments.tmp{{code language="none"}}{{/code}} file is not considered when viewing the status. You can add arbitrary file name patterns to the {{code language="none"}}.gitignore{{/code}} file; for example it is a good idea to ignore {{code language="none"}}*.class{{/code}}, which are binary files generated for Java projects.
++
++=== Discarding Changes ===
++
++While working on his Machine, Alan Turing has made some changes to notes.txt that he later found out to be nonsense:
++
++{{code}}
++$ 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")
++{{/code}}
++
++Help Alan by restoring the last committed state of that file:
++
++{{code}}
++$ git checkout HEAD notes.txt
++$ git status
++# On branch master
++nothing to commit (working directory clean)
++{{/code}}
++
++Instead of HEAD, which is the last commit on the current branch, you can also name any other branch or commit hash. In that case you would have to commit the change to make it permanent. While resolving conflicts it is possible to use {{code language="none"}}--theirs{{/code}} or {{code language="none"}}--ours{{/code}} instead of HEAD, which replaces the whole content of the respective file by their version (the one on the remote branch) or our version (the one on the current branch).
++
++A more brute-force option is using the {{code language="none"}}reset{{/code}} command:
++
++{{code}}
++$ git reset --hard
++HEAD is now at b58ded7 Merge branch 'master' of git.rtsys.informatik.uni-kiel.de:personal-msp/turing
++{{/code}}
++
++This resets //all// changes to the working copy to the head of the current branch, so use it with caution! However, {{code language="none"}}reset{{/code}} does not remove unstaged files. In order to do that in one command, use {{code language="none"}}clean{{/code}}:
++
++{{code}}
++$ git status
++# On branch master
++# Untracked files:
++#   (use "git add <file>..." to include in what will be committed)
++#
++#       test1.tmp
++#       test2.tmp
++nothing added to commit but untracked files present (use "git add" to track)
++$ git clean -f
++Removing test1.tmp
++Removing test2.tmp
++{{/code}}
++
++=== Rebasing ===
++
++Consider the following situation:
++
++[[image:attach:turing-graph-03.png]]
++
++If you want to merge the changes made on the {{code language="none"}}master{{/code}} branch into the {{code language="none"}}sketches{{/code}} branch, the normal way is to use the {{code language="none"}}merge{{/code}} command and create a merge commit. However, the {{code language="none"}}rebase{{/code}} command gives an interesting alternative to that: it reapplies all commits done in the current branch starting from a given reference.
++
++{{code}}
++$ git rebase master
++First, rewinding head to replay your work on top of it...
++Applying: added another example
++Applying: state transitions
++Using index info to reconstruct a base tree...
++Falling back to patching base and 3-way merge...
++Auto-merging notes.txt
++{{/code}}
++
++Afterwards the commit graph looks like this:
++
++[[image:attach:turing-graph-04.png]]
++
++The two commits made in {{code language="none"}}sketches{{/code}} are reapplied starting from the head of the {{code language="none"}}master{{/code}} branch. The resulting structure of commits is much cleaner than before. rebase{{code language="none"}}{{/code}} even allows to squeeze multiple commits into one. Note that in this example a merge conflict had to be resolved in the same way as it was done in Section "Branching and Merging"; instead of committing the resolved file, the rebase command is resumed with {{code language="none"}}git rebase --continue{{/code}}.
++
++{{warning}}
++Never rebase a branch that is already pushed online! Due to the structural change the rebased branch is no longer compatible with the previous one, and pushing it will fail, since fast-forward merge is not possible.
++{{/warning}}
++
++=== Tagging ===
++
++Finally Alan Turing has made a great success in the development of his Machine, and he would like to fix that stage as "Milestone 1". Help him by tagging the current state of the project:
++
++{{code}}
++$ git tag milestone1
++{{/code}}
++
++Then the head of the current branch is stored under the name {{code language="none"}}milestone1{{/code}}, so it can be found very easily at later stages of the project:
++
++{{code}}
++$ git tag
++milestone1
++$ git checkout milestone1
++Note: checking out 'milestone1'.
++
++You are in 'detached HEAD' state. You can look around, make experimental
++changes and commit them, and you can discard any commits you make in this
++state without impacting any branches by performing another checkout.
++
++If you want to create a new branch to retain commits you create, you may
++do so (now or later) by using -b with the checkout command again. Example:
++
++  git checkout -b new_branch_name
++
++HEAD is now at 957f686... Merge remote branch 'gitorious/master'
++{{/code}}
++
++Tags can also be loaded to the server using the {{code language="none"}}push{{/code}} command.

examples.txt

Author

...	...	@@ -1,0 +1,1 @@
	1	+XWiki.XWikiGuest

Size

...	...	@@ -1,0 +1,1 @@
	1	+192 bytes

Content

@@ -1,0 +1,21 @@
++Empty tape with tape head:
++
++    V
++----------------
++
++Write character "a":
++
++    V
++----a-----------
++
++Move one step right:
++
++     V
++----a-----------
++
++Write character "b":
++
++     V
++----ab----------
++
++

notes.txt

Author

...	...	@@ -1,0 +1,1 @@
	1	+XWiki.XWikiGuest

Size

...	...	@@ -1,0 +1,1 @@
	1	+142 bytes

Content

@@ -1,0 +1,6 @@
++ * A tape with fixed length
++ * Tape head can read or write data
++ * Tape head can move left or right
++ * The head is controlled by ... (TODO)
++
++

turing-graph-01.png

Author

...	...	@@ -1,0 +1,1 @@
	1	+XWiki.XWikiGuest

Size

...	...	@@ -1,0 +1,1 @@
	1	+2.9 KB

Content

turing-graph-02.png

Author

...	...	@@ -1,0 +1,1 @@
	1	+XWiki.XWikiGuest

Size

...	...	@@ -1,0 +1,1 @@
	1	+5.4 KB

Content

turing-graph-03.png

Author

...	...	@@ -1,0 +1,1 @@
	1	+XWiki.XWikiGuest

Size

...	...	@@ -1,0 +1,1 @@
	1	+2.5 KB

Content

turing-graph-04.png

Author

...	...	@@ -1,0 +1,1 @@
	1	+XWiki.XWikiGuest

Size

...	...	@@ -1,0 +1,1 @@
	1	+2.1 KB

Content

Confluence.Code.ConfluencePageClass[0]

Id

@@ -1,1 +1,1 @@
--2982134
++2982081

URL

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

Changes for page Git

Summary

Details

Navigation

Quick Links