Summary

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

Details

Page properties

Content

...	...	@@ -120,7 +120,7 @@
120	120	* Right click the files, click //Replace With//, click //HEAD Revision//.
121	121	* Enter {{code language="none"}}git checkout <path>{{/code}} on the command line.
122	122
123		-By giving a branch, tag, or commit number in git checkout <commit> <path>, you can get to any existing version of the files. If no path is given, git checkout <commit> switches your whole working copy and index to the specified branch, tag, or commit number. If git reset is given a commit number, the current branch is modified to point at the given commit.
	123	+By giving a branch, tag, or commit number in {{code language="none"}}git checkout <commit> <path>{{/code}}, you can get to any existing version of the files. If no path is given, {{code language="none"}}git checkout <commit>{{/code}} switches your whole working copy and index to the specified branch, tag, or commit number. If {{code language="none"}}git reset{{/code}} is given a commit number, the current branch is modified to point at the given commit.
124	124
125	125	{{warning}}
126	126	This is a brute force modification, and you probably won't be able to push the new branch
...	...	@@ -128,10 +128,43 @@
128	128
129	129	= Cleaning Your Working Directory =
130	130
131		-In case the working directory is messed up with unstaged files, which are not affected by git reset ~-~-hard, a clean up is achieved by means of git clean -f. The additional switch -d applies this to directories, respectively. Hence, git reset + git clean act like svn revert.
	131	+In case the working directory is messed up with unstaged files, which are not affected by {{code language="none"}}git reset --hard{{/code}}, a clean up is achieved by means of {{code language="none"}}git clean -f{{/code}}. The additional switch {{code language="none"}}-d{{/code}} applies this to directories, respectively. Hence, {{code language="none"}}git reset{{/code}} followed by {{code language="none"}}git clean{{/code}} act like {{code language="none"}}svn revert{{/code}}.
132	132
133		-git clean -X removes only the files that are ignored by Git, that is mainly the .class files generated by the Java compiler. A full rebuild is required afterwards.
	133	+{{code language="none"}}git clean -X{{/code}} removes only the files that are ignored by Git, that is mainly the .class files generated by the Java compiler. A full rebuild is required afterwards.
134	134
135	135	= Branching and Merging =
136	136
137		-
	137	+Branches are used to structure your development and are an essential tool for effective work in the KIELER team. Read the [[doc:Source Code Management]] page if you haven't yet understood what branches are good for.
	138	+
	139	+== Creating a Branch ==
	140	+
	141	+Do one of the following:
	142	+
	143	+* Right-click the KIELER repository in the //Git Repositories// view, click //Switch To//, click //New Branch//.
	144	+* On the command line, enter {{code language="none"}}git branch <name>{{/code}}. In this case, the new branch is not active; if you want to activate the new branch while creating it, enter {{code language="none"}}git checkout -b <name>{{/code}}.
	145	+
	146	+In either case the new branch starts at the current position of your working copy, i.e. it branches from the current branch you are on. In order to branch from a different position, either check out that other branch first or select it as //source ref// in the EGit wizard (on the command line simply type git branch <name> <start_point>).
	147	+
	148	+== Switching to Another Branch ==
	149	+
	150	+Do one of the following:
	151	+
	152	+* Navigate to the branch in the KIELER repository in the //Git Repositories// view, right click it, click //Checkout//.
	153	+* On the command-line, enter {{code language="none"}}git checkout <name>{{/code}}.
	154	+
	155	+Note that your local uncommitted changes are transferred when switching the current branch.
	156	+
	157	+== Merging Branches ==
	158	+
	159	+You always merge another branch into the current branch. Therefore you first have to checkout the target branch prior to merging. Then, do one of the following:
	160	+
	161	+* Navigate to the source branch in the //Git Repositories// view, right-click it, click //Merge.//
	162	+* On the command line, enter {{code language="none"}}git merge <source_name>{{/code}}.
	163	+
	164	+This creates a new //merge commit//, i.e. a commit with two source commits, and the target branch (the one you're currently on) contains all changes that have been done in the source branch (the one selected for merge). The source branch is not modified. A merge is done implicitly when pulling: assuming you're on branch master, the command git pull origin master is the same as git fetch origin followed by git merge origin/master, where origin/master is the remote tracking branch for master.
	165	+
	166	+= Working With Multiple Remote Repositories =
	167	+
	168	+Gitorious allows the creation of personal server-side clones of the KIELER repository, which is highly encouraged as described on the [[doc:Source Code Management]] page. When working with such clones, it is often necessary to synchronize the different server-side repositories with the local one. Git supports this by allowing to configure multiple //remotes// in the local repository. On the command line this is done simply by entering git remote add <name> <url>, where <name> is an arbitrary local identifier for the remote repository. For example, a remote named origin is automatically created when a local repository clone is created through git clone <url>.
	169	+
	170	+When you push or pull branches, simply select the remote you wish to interfere with. Pulling is done by git pull <remote> <branch>, and pushing is done by git push <remote> <branch>.

Confluence.Code.ConfluencePageClass[0]

Id

...	...	@@ -1,1 +1,1 @@
1		-884804
	1	+3604607

URL

...	...	@@ -1,1 +1,1 @@
1		-https://rtsys.informatik.uni-kiel.de/confluence//wiki/spaces/KIELER/pages/884804/Using Git
	1	+https://rtsys.informatik.uni-kiel.de/confluence//wiki/spaces/KIELER/pages/3604607/Using Git