Summary

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

Details

Page properties

Content

...	...	@@ -2,11 +2,11 @@
2	2
3	3	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.
4	4
5		-=== Contents ===
	5	+==== Contents ====
6	6
7	7
8	8
9		-{{toc style="circle" maxLevel="2"/}}
	9	+{{toc style="circle" maxLevel="3"/}}
10	10
11	11	= Creating Commits =
12	12
...	...	@@ -563,78 +563,4 @@
563	563
564	564	[[image:attach:turing-graph-02.png]]
565	565
566		-= Other Useful Commands =
567		-
568		-This section contains optional steps that you don't need to push online, but can be useful for you to learn.
569		-
570		-=== Ignoring Files ===
571		-
572		-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:
573		-
574		-{{noformat}}
575		-$ git status
576		-# On branch master
577		-# Untracked files:
578		-# (use "git add <file>..." to include in what will be committed)
579		-#
580		-# experiments.tmp
581		-nothing added to commit but untracked files present (use "git add" to track)
582		-{{/noformat}}
583		-
584		-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:
585		-
586		-{{noformat}}
587		-$ echo "*.tmp" > .gitignore
588		-$ git add .gitignore
589		-$ git commit -m "added ignore file"
590		-[master 738ce4c] added ignore file
591		- 1 files changed, 1 insertions(+), 0 deletions(-)
592		- create mode 100644 .gitignore
593		-$ git status
594		-# On branch master
595		-# Your branch is ahead of 'origin/master' by 1 commit.
596		-#
597		-nothing to commit (working directory clean)
598		-{{/noformat}}
599		-
600		-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.
601		-
602		-=== Discarding Changes ===
603		-
604		-While working on his Machine, Alan Turing has made some changes to notes.txt that he later found out to be nonsense:
605		-
606		-{{noformat}}
607		-$ git status
608		-# On branch master
609		-# Changed but not updated:
610		-# (use "git add <file>..." to update what will be committed)
611		-# (use "git checkout -- <file>..." to discard changes in working directory)
612		-#
613		-# modified: notes.txt
614		-#
615		-no changes added to commit (use "git add" and/or "git commit -a")
616		-{{/noformat}}
617		-
618		-Help Alan by restoring the last committed state of that file:
619		-
620		-{{noformat}}
621		-$ git checkout HEAD notes.txt
622		-$ git status
623		-# On branch master
624		-nothing to commit (working directory clean)
625		-{{/noformat}}
626		-
627		-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).
628		-
629		-A more brute-force option is using the {{code language="none"}}reset{{/code}} command:
630		-
631		-{{noformat}}
632		-$ git reset --hard
633		-HEAD is now at b58ded7 Merge branch 'master' of git.rtsys.informatik.uni-kiel.de:personal-msp/turing
634		-{{/noformat}}
635		-
636		-This resets //all// changes to the working copy to the head of the current branch, so use it with caution!
637		-
638		-=== Rebasing ===
639		-
640	640

Confluence.Code.ConfluencePageClass[0]

Id

...	...	@@ -1,1 +1,1 @@
1		-2982165
	1	+2982163

URL

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