Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Aniszczyk2010-02-07 18:49:45 +0000
committerMatthias Sohn2010-03-10 23:27:12 +0000
commit296a3675df1116bfaff47df141ff6ce1f14c3ec5 (patch)
tree97c7dc539c36f49695b05570c79cfd6d2c4fc7bd
parent589c30c2e9eb14550cc6063d2a801d2cc9b8bfb5 (diff)
downloadegit-296a3675df1116bfaff47df141ff6ce1f14c3ec5.tar.gz
egit-296a3675df1116bfaff47df141ff6ce1f14c3ec5.tar.xz
egit-296a3675df1116bfaff47df141ff6ce1f14c3ec5.zip
Adding a documentation project for EGit
Change-Id: I20be7fe941ec95ff9f0cbb23a0fd05495b1558f8 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.egit.doc/.classpath5
-rw-r--r--org.eclipse.egit.doc/.project28
-rw-r--r--org.eclipse.egit.doc/META-INF/MANIFEST.MF8
-rw-r--r--org.eclipse.egit.doc/about.html28
-rw-r--r--org.eclipse.egit.doc/build-help.xml135
-rw-r--r--org.eclipse.egit.doc/build.properties7
-rw-r--r--org.eclipse.egit.doc/lib/org.eclipse.mylyn.wikitext.core_1.3.0.I20100116-0000-e3x.jarbin0 -> 285607 bytes
-rw-r--r--org.eclipse.egit.doc/lib/org.eclipse.mylyn.wikitext.mediawiki.core_1.3.0.I20100116-0000-e3x.jarbin0 -> 68233 bytes
-rw-r--r--org.eclipse.egit.doc/plugin.properties3
-rw-r--r--org.eclipse.egit.doc/plugin.xml13
-rw-r--r--org.eclipse.egit.doc/userguide/Adding-a-project-to-version-control.html97
-rw-r--r--org.eclipse.egit.doc/userguide/Committing-changes.html102
-rw-r--r--org.eclipse.egit.doc/userguide/Creating-a-new-empty-Git-Repository.html61
-rw-r--r--org.eclipse.egit.doc/userguide/EGit Reference.html117
-rw-r--r--org.eclipse.egit.doc/userguide/EGit User Guide-toc.xml35
-rw-r--r--org.eclipse.egit.doc/userguide/EGit User Guide.html117
-rw-r--r--org.eclipse.egit.doc/userguide/Inspecting-the-state-of-the-Repository.html164
-rw-r--r--org.eclipse.egit.doc/userguide/Updating-This-Document.html54
-rw-r--r--org.eclipse.egit.doc/userguide/Working-with-remote-Repositories.html240
-rw-r--r--org.eclipse.egit.doc/userguide/images/01-CloneExistingRepository.pngbin0 -> 25168 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/01-CreateNewJavaProject.pngbin0 -> 7361 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/01-TextDecorations.pngbin0 -> 9724 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/02-GitProtocol.pngbin0 -> 13097 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/02-IconDecorations.pngbin0 -> 6837 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/02-TeamShareProject.pngbin0 -> 3049 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/03-CompareWithIndex.pngbin0 -> 8301 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/03-SelectRepositoryTypeGit.pngbin0 -> 11037 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/04-QuickDiffPreferences.pngbin0 -> 16398 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/04-SelectProjectToConfigureGitRepository.pngbin0 -> 10803 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/05-CreateNewGitRepository.pngbin0 -> 10577 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/05-QuickDiffInEditor.pngbin0 -> 5858 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/05-branches.pngbin0 -> 7016 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/06-LocalStorage.pngbin0 -> 14718 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/06-NewGitRepository.pngbin0 -> 3294 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/06-QuickDiffInEditorPopup.pngbin0 -> 3476 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/07-AddToVersionControl.pngbin0 -> 5943 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/07-ImportProjects.pngbin0 -> 18123 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/08-AddedToVersionControl.pngbin0 -> 3971 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/09-IgnoredResources.pngbin0 -> 9100 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/10-ClickCommit.pngbin0 -> 6142 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/11-CommitDialog.pngbin0 -> 8292 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/12-CommittedFiles.pngbin0 -> 3070 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/13-SelectResourceHistory.pngbin0 -> 2480 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/14-ResourceHistory.pngbin0 -> 16907 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/15-FirstImplementation.pngbin0 -> 5572 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/16-ShowChange.pngbin0 -> 26665 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/EGit_AddFile.pngbin0 -> 138765 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/EGit_AddedAndModifiedFiles.pngbin0 -> 40088 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/EGit_AmendBringsOldCommitMessage.pngbin0 -> 25215 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/EGit_Commit.pngbin0 -> 69722 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/EGit_CommitDialog.pngbin0 -> 20692 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/EGit_Corrected.pngbin0 -> 32155 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/EGit_Typo.pngbin0 -> 31417 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/Egit-0.6-001-CreateRepoAtGithub.pngbin0 -> 65996 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/Egit-0.6-002-CloneUrl.pngbin0 -> 7850 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/Egit-0.6-003-SshPreferences.pngbin0 -> 28237 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/Egit-0.6-004-PushDialog.pngbin0 -> 23207 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/Egit-0.6-005-AcceptHostKey.pngbin0 -> 11751 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/Egit-0.6-006-PassPhrase.pngbin0 -> 11361 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/Egit-0.6-007-PushRefSpecifications.pngbin0 -> 33102 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/Egit-0.6-008-PushConfirmation.pngbin0 -> 23004 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/Egit-0.6-009-PushResult.pngbin0 -> 11929 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/Egit-0.6-010-PushResultOnGithub.pngbin0 -> 74460 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/Warning2.pngbin0 -> 2604 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/home.gifbin0 -> 582 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/next.gifbin0 -> 327 bytes
-rw-r--r--org.eclipse.egit.doc/userguide/images/prev.gifbin0 -> 327 bytes
67 files changed, 1214 insertions, 0 deletions
diff --git a/org.eclipse.egit.doc/.classpath b/org.eclipse.egit.doc/.classpath
new file mode 100644
index 0000000000..710b27a721
--- /dev/null
+++ b/org.eclipse.egit.doc/.classpath
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/org.eclipse.egit.doc/.project b/org.eclipse.egit.doc/.project
new file mode 100644
index 0000000000..62ded835ac
--- /dev/null
+++ b/org.eclipse.egit.doc/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.egit.doc</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/org.eclipse.egit.doc/META-INF/MANIFEST.MF b/org.eclipse.egit.doc/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..5fda073a14
--- /dev/null
+++ b/org.eclipse.egit.doc/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.egit.doc;singleton:=true
+Bundle-Version: 0.6.0.qualifier
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Vendor: %Bundle-Vendor
+Bundle-Localization: plugin
diff --git a/org.eclipse.egit.doc/about.html b/org.eclipse.egit.doc/about.html
new file mode 100644
index 0000000000..c0c616c4bb
--- /dev/null
+++ b/org.eclipse.egit.doc/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 2, 2006</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/org.eclipse.egit.doc/build-help.xml b/org.eclipse.egit.doc/build-help.xml
new file mode 100644
index 0000000000..3498cfc99b
--- /dev/null
+++ b/org.eclipse.egit.doc/build-help.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+ Copyright (c) 2010 Chris Aniszczyk and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Chris Aniszczyk - initial API and implementation
+ -->
+
+<project name="org.eclipse.egit.doc" default="all">
+ <description>
+ Generate Eclipse help content for the EGit user guide
+ </description>
+
+ <property name="help.doc.url.base" value="http://wiki.eclipse.org"/>
+ <property name="wiki.url.base" value="${help.doc.url.base}/EGit"/>
+ <property name="imageFolder" value="images"/>
+
+ <path id="wikitext.tasks.classpath">
+ <fileset dir="lib">
+ <include name="org.eclipse.mylyn.wikitext.*core*.jar"/>
+ </fileset>
+ </path>
+
+ <taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/internal/wikitext/mediawiki/core/tasks/tasks.properties"/>
+ <taskdef classpathref="wikitext.tasks.classpath" resource="org/eclipse/mylyn/wikitext/core/util/anttask/tasks.properties"/>
+
+ <target name="init">
+ <mkdir dir="tmp"/>
+ </target>
+
+ <target name="clean" depends="init">
+ <delete includeemptydirs="true" failonerror="false">
+ <fileset dir="tmp"/>
+ </delete>
+ </target>
+
+ <target name="all" depends="init" description="Generate Eclipse help content for the EGit user guide">
+ <eclipse-wiki-to-help
+ help.doc.filenamenoextension="EGit User Guide"
+ help.doc.url.base="${help.doc.url.base}"
+ help.doc.pageName="EGit/User_Guide"
+ help.imagefolder="${imageFolder}"
+ targetfolder="userguide"
+ wiki.url.base="${help.doc.url.base}/EGit"/>
+ <replaceregexp file="userguide/EGit User Guide-toc.xml" match="(&lt;topic.*?href=&quot;userguide/Task-Repository-Connectors.html.*?&gt;(\s*&lt;topic\s*href=&quot;.*?&quot;\s*label=&quot;.*&quot;&gt;\s*?&lt;/topic&gt;)+)(\s*)(&lt;/topic&gt;)"
+ replace="\1\3&lt;anchor id=&quot;additions-repository-connectors&quot;/&gt;\3\4"
+ flags="s"/>
+ </target>
+
+ <macrodef name="eclipse-wiki-to-help">
+ <attribute name="help.doc.url.base"/>
+ <attribute name="wiki.url.base"/>
+ <attribute name="help.doc.pageName"/>
+ <attribute name="help.doc.filenameNoExtension"/>
+ <attribute name="help.imageFolder"/>
+ <attribute name="targetFolder"/>
+ <sequential>
+ <get dest="tmp/@{help.doc.filenameNoExtension}.mediawiki" src="@{help.doc.url.base}/index.php?title=@{help.doc.pageName}&amp;action=raw"/>
+ <echo append="true" file="tmp/@{help.doc.filenameNoExtension}.mediawiki">
+
+= Updating This Document =
+
+This document is maintained in a collaborative wiki. If you wish to update or modify this document please visit
+@{help.doc.url.base}/@{help.doc.pageName}
+ </echo>
+
+ <copy todir="tmp">
+ <fileset dir="images"/>
+ </copy>
+ <mediawiki-fetch-images dest="tmp" url="@{help.doc.url.base}" pageName="@{help.doc.pageName}"/>
+
+ <wikitext-to-eclipse-help markupLanguage="org.eclipse.mylyn.wikitext.mediawiki.core.MediaWikiLanguage"
+ multipleOutputFiles="true"
+ navigationImages="true"
+ helpPrefix="@{targetFolder}"
+ internallinkpattern="@{wiki.url.base}/{0}"
+ validate="true"
+ failonvalidationerror="true"
+ prependImagePrefix="${imageFolder}"
+ formatoutput="true"
+ defaultAbsoluteLinkTarget="mylyn_external">
+ <fileset dir="tmp" includes="**/*.mediawiki"/>
+ <stylesheet url="book.css"/>
+ </wikitext-to-eclipse-help>
+
+ <mkdir dir="@{targetFolder}/${imageFolder}"/>
+ <copy todir="@{targetFolder}/${imageFolder}" overwrite="true">
+ <fileset dir="tmp">
+ <include name="*.gif"/>
+ <include name="*.png"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetFolder}" overwrite="true">
+ <fileset dir="tmp">
+ <include name="*.html"/>
+ <include name="*toc.xml"/>
+ <exclude name="help.doc.html"/>
+ </fileset>
+ </copy>
+ <antcall target="test"/>
+ </sequential>
+ </macrodef>
+
+ <target name="test" depends="init" description="verify that all of the HTML files are well-formed XML">
+ <echo level="info">
+Validating help content XML and HTML files: The Eclipse help system expects well-formed XML
+
+If validation fails it is because either:
+
+* the userguide source code is poorly formed, or
+* the WikiText MediaWiki parser has a bug
+
+Problems with userguide source are usually caused by improper use of HTML markup in the MediaWiki source,
+or inadvertently starting a line with a space character (in MediaWiki this starts a preformatted block)
+ </echo>
+
+ <!--
+ Don't bother with DTD validation: we only care if the files are well-formed.
+ We therefore provide an empty DTD
+ -->
+ <echo file="tmp/__empty.dtd" message=""/>
+ <xmlvalidate lenient="true">
+ <fileset dir="userguide">
+ <include name="**/*.xml"/>
+ </fileset>
+ <fileset dir="userguide">
+ <include name="**/*.html"/>
+ </fileset>
+ <dtd publicid="-//W3C//DTD XHTML 1.0 Transitional//EN" location="${basedir}/tmp/__empty.dtd"/>
+ </xmlvalidate>
+ </target>
+</project>
diff --git a/org.eclipse.egit.doc/build.properties b/org.eclipse.egit.doc/build.properties
new file mode 100644
index 0000000000..1a3c72ee38
--- /dev/null
+++ b/org.eclipse.egit.doc/build.properties
@@ -0,0 +1,7 @@
+bin.includes = META-INF/,\
+ .,\
+ images/,\
+ about.html,\
+ plugin.xml,\
+ userguide/,\
+ plugin.properties
diff --git a/org.eclipse.egit.doc/lib/org.eclipse.mylyn.wikitext.core_1.3.0.I20100116-0000-e3x.jar b/org.eclipse.egit.doc/lib/org.eclipse.mylyn.wikitext.core_1.3.0.I20100116-0000-e3x.jar
new file mode 100644
index 0000000000..f3972facc6
--- /dev/null
+++ b/org.eclipse.egit.doc/lib/org.eclipse.mylyn.wikitext.core_1.3.0.I20100116-0000-e3x.jar
Binary files differ
diff --git a/org.eclipse.egit.doc/lib/org.eclipse.mylyn.wikitext.mediawiki.core_1.3.0.I20100116-0000-e3x.jar b/org.eclipse.egit.doc/lib/org.eclipse.mylyn.wikitext.mediawiki.core_1.3.0.I20100116-0000-e3x.jar
new file mode 100644
index 0000000000..3b44b0b3bc
--- /dev/null
+++ b/org.eclipse.egit.doc/lib/org.eclipse.mylyn.wikitext.mediawiki.core_1.3.0.I20100116-0000-e3x.jar
Binary files differ
diff --git a/org.eclipse.egit.doc/plugin.properties b/org.eclipse.egit.doc/plugin.properties
new file mode 100644
index 0000000000..61702b8f44
--- /dev/null
+++ b/org.eclipse.egit.doc/plugin.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.egit.doc
+Bundle-Vendor = Eclipse.org
+Bundle-Name = EGit Documentation \ No newline at end of file
diff --git a/org.eclipse.egit.doc/plugin.xml b/org.eclipse.egit.doc/plugin.xml
new file mode 100644
index 0000000000..204aaf6fb1
--- /dev/null
+++ b/org.eclipse.egit.doc/plugin.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+
+ <extension
+ point="org.eclipse.help.toc">
+ <toc
+ file="userguide/EGit User Guide-toc.xml"
+ primary="true">
+ </toc>
+ </extension>
+
+</plugin>
diff --git a/org.eclipse.egit.doc/userguide/Adding-a-project-to-version-control.html b/org.eclipse.egit.doc/userguide/Adding-a-project-to-version-control.html
new file mode 100644
index 0000000000..c50e220848
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/Adding-a-project-to-version-control.html
@@ -0,0 +1,97 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title>EGit User Guide - Adding a project to version control</title>
+ <link type="text/css" rel="stylesheet" href="book.css"/>
+ </head>
+ <body>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <th style="width: 100%" align="center" colspan="3">Adding a project to version control</th>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="EGit User Guide.html" title="Getting Started">
+ <img alt="Previous" border="0" src="images/prev.gif"/>
+ </a>
+ </td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right">
+ <a href="Creating-a-new-empty-Git-Repository.html" title="Creating a new empty Git Repository">
+ <img alt="Next" border="0" src="images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top">Getting Started</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Creating a new empty Git Repository</td>
+ </tr>
+ </table><hr/>
+ <h1 id="Adding_a_project_to_version_control">Adding a project to version control</h1>
+ <p>Select the project node of the project to be added to version control</p>
+ <p>
+ <img border="0" src="images/01-CreateNewJavaProject.png"/>
+ </p>
+ <p>Execute "Team" -> "Share Project" on the project node</p>
+ <p>
+ <img border="0" src="images/02-TeamShareProject.png"/>
+ </p>
+ <p>Select repository type "Git" and click "Next"</p>
+ <p>
+ <img border="0" src="images/03-SelectRepositoryTypeGit.png"/>
+ </p>
+ <p>To configure the Git repository select the new Eclipse project HelloWorld</p>
+ <p>
+ <img border="0" src="images/04-SelectProjectToConfigureGitRepository.png"/>
+ </p>
+ <p>Click "Create" to initialize a new Git repository for the HelloWorld project. If your project already resides in the working tree of an exisiting GIT repository the repository is chosen automatically.</p>
+ <p>
+ <img border="0" src="images/05-CreateNewGitRepository.png"/>
+ </p>
+ <p>Click "Finish" to close the wizard.</p>
+ <p>The decorator text "
+ <a href="master">master</a>" behind the project shows that this project is tracked in a repository on the master branch
+ and the question mark decorators show that the ".classpath" and ".project" files are not yet under version control
+ </p>
+ <p>
+ <img border="0" src="images/06-NewGitRepository.png"/>
+ </p>
+ <p>Select "Team" -> "Add to version control" on the project node</p>
+ <p>
+ <img border="0" src="images/07-AddToVersionControl.png"/>
+ </p>
+ <p>The plus decorators show that now the ".classpath" and ".project" files are added to version control</p>
+ <p>
+ <img border="0" src="images/08-AddedToVersionControl.png"/>
+ </p>
+ <p>Create a file .gitignore in the project folder with the following content:</p>
+ <p>bin</p>
+ <p>This excludes the bin folder from GIT's list of untracked files. Add .gitignore to version control.</p><hr/>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="EGit User Guide.html" title="Getting Started">
+ <img alt="Previous" border="0" src="images/prev.gif"/>
+ </a>
+ </td>
+ <td style="width: 60%" align="center">
+ <a href="EGit User Guide.html" title="EGit User Guide">
+ <img alt="EGit User Guide" border="0" src="images/home.gif"/>
+ </a>
+ </td>
+ <td style="width: 20%" align="right">
+ <a href="Creating-a-new-empty-Git-Repository.html" title="Creating a new empty Git Repository">
+ <img alt="Next" border="0" src="images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top">Getting Started</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Creating a new empty Git Repository</td>
+ </tr>
+ </table>
+ </body>
+</html>
diff --git a/org.eclipse.egit.doc/userguide/Committing-changes.html b/org.eclipse.egit.doc/userguide/Committing-changes.html
new file mode 100644
index 0000000000..5fe08d4945
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/Committing-changes.html
@@ -0,0 +1,102 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title>EGit User Guide - Committing changes</title>
+ <link type="text/css" rel="stylesheet" href="book.css"/>
+ </head>
+ <body>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <th style="width: 100%" align="center" colspan="3">Committing changes</th>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="Inspecting-the-state-of-the-Repository.html" title="Inspecting the state of the Repository">
+ <img alt="Previous" border="0" src="images/prev.gif"/>
+ </a>
+ </td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right">
+ <a href="Updating-This-Document.html" title="Updating This Document">
+ <img alt="Next" border="0" src="images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top">Inspecting the state of the Repository</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Updating This Document</td>
+ </tr>
+ </table><hr/>
+ <h1 id="Committing_changes">Committing changes</h1>
+ <p>Modifications to a project which is version-controlled with Git are persistently recorded in the history through commits. In Git you modify your project until you have reached a state you are satisfied with and then you commit all these changes together to the repository in one single commit.</p>
+ <h2 id="Modifying_the_content">Modifying the content</h2>
+ <p>If you have a project which is already shared with Git then doing the actual modifications is easy: just modify or delete files either within Eclipse or even directly on the file-system. There is no need to "check-out" files or to tell Git in advance about these operations. Only when you add new files you should be cautious: new files which should be version-controlled have to be explicitly announced to git through the files context-menu.</p>
+ <p>
+ <img border="0" src="images/EGit_AddFile.png"/>
+ </p>
+ <p>You can see for example in the Package Explorer View which files have been added (file icon marked with "+") and which files have been modified (file marked with ">" in front of the filename). Here is an example of one added and one modified file in the Package Explorer:</p>
+ <p>
+ <img border="0" src="images/EGit_AddedAndModifiedFiles.png"/>
+ </p>
+ <h2 id="Committing">Committing</h2>
+ <p>When you are satisfied with the state of the project you may commit your changes. To do that select "Team -> Commit..." from the context menu of a project or a file in the project. </p>
+ <p>
+ <img border="0" src="images/EGit_Commit.png"/>
+ </p>
+ <p>It does not play a role whether you select this action on a certain file or on the whole project. The reason for this is that Git tracks all changes made to the whole repository capturing the modifications of each and every version-controlled file in that repository not regarding if these files reside in the same Eclipse project or not. </p>
+ <p>Once you have triggered the commit the following dialog will pop-up.</p>
+ <p>
+ <img border="0" src="images/EGit_CommitDialog.png"/>
+ </p>
+ <p>In this dialog you specifiy the commit message describing the change.</p>
+ <p>Additionally this dialog controls which of the changes will be included in the commit. If you clear the checkbox in front of a file, the changes to this file will not be included in the commit. The local file in your eclipse workspace will still contain the modifications giving you the chance to commit these changes with a subsequent commit. This feature is often used to separate modifications done to a set of files into different commits. </p>
+ <p>One example: Imagine since the last commit you have fixed a bug in A.java and you have added a new method to B.java. These two modifications are logically independent from each other hence you may want to commit them in two independant commits. In this case you initate the commit, deselect B.java from the set of committed files and specify a commit message describing only the bugfix in A.java. After a succesfull first commit you just call commit again and the upcoming dialog will present you the remaining changes in B.java. Now you specify a commit message describing the addition of the method and finish the second commit.</p>
+ <p>Be aware that new files you added to the project which have not been explicitly added to version control (see "Modifying the content") will not be listed in the commit dialog and will not be part of the commit. If you are not sure whether you have created such files you may select "Team -> Add to Version Control" on an Eclipse project to add new files in the project to version control.</p>
+ <h3 id="Ammending_Commits">Ammending Commits</h3>
+ <p>When you commit you may specify that the current commit should "amend" the previous commit in the current branch. Your commit will then replace the previous commit. This feature is often use to correct wrong commits before they are published to other repositories.</p>
+ <p>Example: Imagine you have committed a change to a file containing a typo </p>
+ <p>
+ <img border="0" src="images/EGit_Typo.png"/>
+ </p>
+ <p>After you committed you detect the typo. In order to correct this typo and the corresponding commit you just fix the typo in the source file</p>
+ <p>
+ <img border="0" src="images/EGit_Corrected.png"/>
+ </p>
+ <p>Afterwards you trigger the commit and select the option "Amend previous commit". </p>
+ <p>
+ <img border="0" src="images/EGit_AmendBringsOldCommitMessage.png"/>
+ </p>
+ <p>The commit message of your previous commit (the one which you want to replace) is filled into the "Commit Message" field. This gives you the chance not only to correct errors in the content of the version-controlled files but to also correct errors (e.g. typos) in the commit message describing your change.</p>
+ <p>As an alternative to amending you could just commit the corrected version as a subsequent commit. But the first commit containing the typo is of no use to anybody else and in order not to clutter the history of your project with unneeded commits you may decide to use the amend feature.</p>
+ <p>Be aware that amending commits which are already published to other repositories may cause trouble. Once you have pushed a commit to a remote repository or your local repository was cloned by somebody else you should be very careful whith amending commits. In this case publishing a second commit which corrects the first one is probably a better solution.</p>
+ <h3 id="Signing_off_commits">Signing off commits</h3>
+ <p>Git gives you the chance to "sign off" commits. This adds a "Signed-off-by: &lt;Your Name and Email-Adress>" footer to the commit message.
+ The purpose of this signed-off-by information is not defined by Git but by the team using Git. Some teams use this information to record who has reviewed a certain commit. Other teams use the signed-off information to record that a commiter agreed to certain standards/rules. E.g. you may have to sign-off your own commits to state that you have read and understood the license-specific rules of your project.</p><hr/>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="Inspecting-the-state-of-the-Repository.html" title="Inspecting the state of the Repository">
+ <img alt="Previous" border="0" src="images/prev.gif"/>
+ </a>
+ </td>
+ <td style="width: 60%" align="center">
+ <a href="EGit User Guide.html" title="EGit User Guide">
+ <img alt="EGit User Guide" border="0" src="images/home.gif"/>
+ </a>
+ </td>
+ <td style="width: 20%" align="right">
+ <a href="Updating-This-Document.html" title="Updating This Document">
+ <img alt="Next" border="0" src="images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top">Inspecting the state of the Repository</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Updating This Document</td>
+ </tr>
+ </table>
+ </body>
+</html>
diff --git a/org.eclipse.egit.doc/userguide/Creating-a-new-empty-Git-Repository.html b/org.eclipse.egit.doc/userguide/Creating-a-new-empty-Git-Repository.html
new file mode 100644
index 0000000000..27820a7523
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/Creating-a-new-empty-Git-Repository.html
@@ -0,0 +1,61 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title>EGit User Guide - Creating a new empty Git Repository</title>
+ <link type="text/css" rel="stylesheet" href="book.css"/>
+ </head>
+ <body>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <th style="width: 100%" align="center" colspan="3">Creating a new empty Git Repository</th>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="Adding-a-project-to-version-control.html" title="Adding a project to version control">
+ <img alt="Previous" border="0" src="images/prev.gif"/>
+ </a>
+ </td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right">
+ <a href="Working-with-remote-Repositories.html" title="Working with remote Repositories">
+ <img alt="Next" border="0" src="images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top">Adding a project to version control</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Working with remote Repositories</td>
+ </tr>
+ </table><hr/>
+ <h1 id="Creating_a_new_empty_Git_Repository">Creating a new empty Git Repository</h1>
+ <p>This is currently not possible with EGit. You have to create a project first and to share it afterwards. The Share Project Wizard supports creation of Git repositories (see
+ <a href="http://wiki.eclipse.org/EGit/User_Guide/Sharing#Adding_a_project_to_version_control" title="EGit/User Guide/Sharing#Adding a project to version control" target="mylyn_external">Adding a project to version control</a>).
+ </p><hr/>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="Adding-a-project-to-version-control.html" title="Adding a project to version control">
+ <img alt="Previous" border="0" src="images/prev.gif"/>
+ </a>
+ </td>
+ <td style="width: 60%" align="center">
+ <a href="EGit User Guide.html" title="EGit User Guide">
+ <img alt="EGit User Guide" border="0" src="images/home.gif"/>
+ </a>
+ </td>
+ <td style="width: 20%" align="right">
+ <a href="Working-with-remote-Repositories.html" title="Working with remote Repositories">
+ <img alt="Next" border="0" src="images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top">Adding a project to version control</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Working with remote Repositories</td>
+ </tr>
+ </table>
+ </body>
+</html>
diff --git a/org.eclipse.egit.doc/userguide/EGit Reference.html b/org.eclipse.egit.doc/userguide/EGit Reference.html
new file mode 100644
index 0000000000..53fff5b596
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/EGit Reference.html
@@ -0,0 +1,117 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title>EGit Reference</title>
+ <link type="text/css" rel="stylesheet" href="book.css"/>
+ </head>
+ <body>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <th style="width: 100%" align="center" colspan="3">EGit Reference</th>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left"></td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right">
+ <a href="Adding-a-project-to-version-control.html" title="Adding a project to version control">
+ <img alt="Next" border="0" src="images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top"></td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Adding a project to version control</td>
+ </tr>
+ </table><hr/>
+ <h1 id="Getting_Started">Getting Started</h1>
+ <p>Create a new Java project "HelloWorld"</p>
+ <p>
+ <img border="0" src="images/01-CreateNewJavaProject.png"/>
+ </p>
+ <p>Select "File" -> "Team" -> "Share Project"</p>
+ <p>
+ <img border="0" src="images/02-TeamShareProject.png"/>
+ </p>
+ <p>Select repository type "Git" and click "Next"</p>
+ <p>
+ <img border="0" src="images/03-SelectRepositoryTypeGit.png"/>
+ </p>
+ <p>To configure the Git repository select the new Eclipse project HelloWorld</p>
+ <p>
+ <img border="0" src="images/04-SelectProjectToConfigureGitRepository.png"/>
+ </p>
+ <p>Click "Create" to initialize a new Git repository for the HelloWorld project. If your project already resides in the working tree of an exisiting GIT repository the repository is chosen automatically.</p>
+ <p>
+ <img border="0" src="images/05-CreateNewGitRepository.png"/>
+ </p>
+ <p>Click "Finish" to close the wizard.</p>
+ <p>The decorator text "
+ <a href="master">master</a>" behind the project shows that this project is tracked in a repository on the master branch
+ and the question mark decorators show that the ".classpath" and ".project" files are not yet under version control
+ </p>
+ <p>
+ <img border="0" src="images/06-NewGitRepository.png"/>
+ </p>
+ <p>Select "Team" -> "Add to version control" on the project node</p>
+ <p>
+ <img border="0" src="images/07-AddToVersionControl.png"/>
+ </p>
+ <p>The plus decorators show that now the ".classpath" and ".project" files are added to version control</p>
+ <p>Create a file .gitignore in the project folder with the following content:</p>
+ <p>bin</p>
+ <p>This excludes the bin folder from GIT's list of untracked files. Add .gitignore to version control.</p>
+ <p>
+ <img border="0" src="images/08-AddedToVersionControl.png"/>
+ </p>
+ <p>The file under ".settings" is not added to version control since it is by default on the list of ignored resources which can be changed in "Preferences" -> "Team" -> "Ignored Resources"</p>
+ <p>
+ <img border="0" src="images/09-IgnoredResources.png"/>
+ </p>
+ <p>Select "Team" -> "Commit" from the context menu on the project</p>
+ <p>
+ <img border="0" src="images/10-ClickCommit.png"/>
+ </p>
+ <p>Enter a commit message explaining your change, the first line (separated by an empty line) will become the short log for this commit. By default the author and committer are taken from the .gitconfig file in your home directory. You may check the checkbox "Add Signed-of-by" to add a Signed-off-by tag. If you are committing the change of another author you may alter the author field to give the name and email address of the author. Click "Commit" to commit your first change.</p>
+ <p>
+ <img border="0" src="images/11-CommitDialog.png"/>
+ </p>
+ <p>Note that the decorators of the committed files changed.</p>
+ <p>
+ <img border="0" src="images/12-CommittedFiles.png"/>
+ </p>
+ <p>Select "Team" -> "Show in Resource History" from the context menu to inspect the history of a resource</p>
+ <p>
+ <img border="0" src="images/13-SelectResourceHistory.png"/>
+ </p>
+ <p>
+ <img border="0" src="images/14-ResourceHistory.png"/>
+ </p>
+ <p>Create a new Java class HelloWorld and implement it, then add it to version control and commit your change.
+ Improve your implementation and commit the improved class, the resource history should now show 2 commits for this class.</p>
+ <p>
+ <img border="0" src="images/15-FirstImplementation.png"/>
+ </p>
+ <p>Double click "src/HelloWorld.java" in the Resource History View to open your last committed change in the Eclipse compare view</p>
+ <p>
+ <img border="0" src="images/16-ShowChange.png"/>
+ </p><hr/>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <td style="width: 20%" align="left"></td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right">
+ <a href="Adding-a-project-to-version-control.html" title="Adding a project to version control">
+ <img alt="Next" border="0" src="images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top"></td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Adding a project to version control</td>
+ </tr>
+ </table>
+ </body>
+</html>
diff --git a/org.eclipse.egit.doc/userguide/EGit User Guide-toc.xml b/org.eclipse.egit.doc/userguide/EGit User Guide-toc.xml
new file mode 100644
index 0000000000..f6d97ad9b4
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/EGit User Guide-toc.xml
@@ -0,0 +1,35 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<toc topic="userguide/EGit User Guide.html" label="EGit User Guide">
+ <topic href="userguide/EGit User Guide.html" label="Getting Started"></topic>
+ <topic href="userguide/Adding-a-project-to-version-control.html" label="Adding a project to version control"></topic>
+ <topic href="userguide/Creating-a-new-empty-Git-Repository.html" label="Creating a new empty Git Repository"></topic>
+ <topic href="userguide/Working-with-remote-Repositories.html" label="Working with remote Repositories">
+ <topic href="userguide/Working-with-remote-Repositories.html#Cloning_remote_Repositories" label="Cloning remote Repositories">
+ <topic href="userguide/Working-with-remote-Repositories.html#Repository_Selection" label="Repository Selection"></topic>
+ <topic href="userguide/Working-with-remote-Repositories.html#Branch_selection" label="Branch selection"></topic>
+ <topic href="userguide/Working-with-remote-Repositories.html#Local_Destination" label="Local Destination"></topic>
+ <topic href="userguide/Working-with-remote-Repositories.html#Import_Projects" label="Import Projects"></topic>
+ </topic>
+ <topic href="userguide/Working-with-remote-Repositories.html#Pushing_a_Local_Repository_to_GitHub" label="Pushing a Local Repository to GitHub">
+ <topic href="userguide/Working-with-remote-Repositories.html#Create_Local_Repository" label="Create Local Repository"></topic>
+ <topic href="userguide/Working-with-remote-Repositories.html#Create_Repository_at_GitHub" label="Create Repository at GitHub"></topic>
+ <topic href="userguide/Working-with-remote-Repositories.html#Eclipse_SSH_Configuration" label="Eclipse SSH Configuration"></topic>
+ <topic href="userguide/Working-with-remote-Repositories.html#Push_Upstream" label="Push Upstream"></topic>
+ </topic>
+ <topic href="userguide/Working-with-remote-Repositories.html#Pulling_.28merge_or_rebase.29_new_changes_from_upstream" label="Pulling (merge or rebase) new changes from upstream"></topic>
+ </topic>
+ <topic href="userguide/Inspecting-the-state-of-the-Repository.html" label="Inspecting the state of the Repository">
+ <topic href="userguide/Inspecting-the-state-of-the-Repository.html#Label_Decorations" label="Label Decorations"></topic>
+ <topic href="userguide/Inspecting-the-state-of-the-Repository.html#Commit_dialog" label="Commit dialog"></topic>
+ <topic href="userguide/Inspecting-the-state-of-the-Repository.html#Comparing_Content" label="Comparing Content"></topic>
+ <topic href="userguide/Inspecting-the-state-of-the-Repository.html#Quickdiff" label="Quickdiff"></topic>
+ </topic>
+ <topic href="userguide/Committing-changes.html" label="Committing changes">
+ <topic href="userguide/Committing-changes.html#Modifying_the_content" label="Modifying the content"></topic>
+ <topic href="userguide/Committing-changes.html#Committing" label="Committing">
+ <topic href="userguide/Committing-changes.html#Ammending_Commits" label="Ammending Commits"></topic>
+ <topic href="userguide/Committing-changes.html#Signing_off_commits" label="Signing off commits"></topic>
+ </topic>
+ </topic>
+ <topic href="userguide/Updating-This-Document.html" label="Updating This Document"></topic>
+</toc> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/userguide/EGit User Guide.html b/org.eclipse.egit.doc/userguide/EGit User Guide.html
new file mode 100644
index 0000000000..0ead812e6b
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/EGit User Guide.html
@@ -0,0 +1,117 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title>EGit User Guide</title>
+ <link type="text/css" rel="stylesheet" href="book.css"/>
+ </head>
+ <body>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <th style="width: 100%" align="center" colspan="3">EGit User Guide</th>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left"></td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right">
+ <a href="Adding-a-project-to-version-control.html" title="Adding a project to version control">
+ <img alt="Next" border="0" src="images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top"></td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Adding a project to version control</td>
+ </tr>
+ </table><hr/>
+ <h1 id="Getting_Started">Getting Started</h1>
+ <p>Create a new Java project "HelloWorld"</p>
+ <p>
+ <img border="0" src="images/01-CreateNewJavaProject.png"/>
+ </p>
+ <p>Select "File" -> "Team" -> "Share Project"</p>
+ <p>
+ <img border="0" src="images/02-TeamShareProject.png"/>
+ </p>
+ <p>Select repository type "Git" and click "Next"</p>
+ <p>
+ <img border="0" src="images/03-SelectRepositoryTypeGit.png"/>
+ </p>
+ <p>To configure the Git repository select the new Eclipse project HelloWorld</p>
+ <p>
+ <img border="0" src="images/04-SelectProjectToConfigureGitRepository.png"/>
+ </p>
+ <p>Click "Create" to initialize a new Git repository for the HelloWorld project. If your project already resides in the working tree of an exisiting GIT repository the repository is chosen automatically.</p>
+ <p>
+ <img border="0" src="images/05-CreateNewGitRepository.png"/>
+ </p>
+ <p>Click "Finish" to close the wizard.</p>
+ <p>The decorator text "
+ <a href="master">master</a>" behind the project shows that this project is tracked in a repository on the master branch
+ and the question mark decorators show that the ".classpath" and ".project" files are not yet under version control
+ </p>
+ <p>
+ <img border="0" src="images/06-NewGitRepository.png"/>
+ </p>
+ <p>Select "Team" -> "Add to version control" on the project node</p>
+ <p>
+ <img border="0" src="images/07-AddToVersionControl.png"/>
+ </p>
+ <p>The plus decorators show that now the ".classpath" and ".project" files are added to version control</p>
+ <p>Create a file .gitignore in the project folder with the following content:</p>
+ <p>bin</p>
+ <p>This excludes the bin folder from GIT's list of untracked files. Add .gitignore to version control.</p>
+ <p>
+ <img border="0" src="images/08-AddedToVersionControl.png"/>
+ </p>
+ <p>The file under ".settings" is not added to version control since it is by default on the list of ignored resources which can be changed in "Preferences" -> "Team" -> "Ignored Resources"</p>
+ <p>
+ <img border="0" src="images/09-IgnoredResources.png"/>
+ </p>
+ <p>Select "Team" -> "Commit" from the context menu on the project</p>
+ <p>
+ <img border="0" src="images/10-ClickCommit.png"/>
+ </p>
+ <p>Enter a commit message explaining your change, the first line (separated by an empty line) will become the short log for this commit. By default the author and committer are taken from the .gitconfig file in your home directory. You may check the checkbox "Add Signed-of-by" to add a Signed-off-by tag. If you are committing the change of another author you may alter the author field to give the name and email address of the author. Click "Commit" to commit your first change.</p>
+ <p>
+ <img border="0" src="images/11-CommitDialog.png"/>
+ </p>
+ <p>Note that the decorators of the committed files changed.</p>
+ <p>
+ <img border="0" src="images/12-CommittedFiles.png"/>
+ </p>
+ <p>Select "Team" -> "Show in Resource History" from the context menu to inspect the history of a resource</p>
+ <p>
+ <img border="0" src="images/13-SelectResourceHistory.png"/>
+ </p>
+ <p>
+ <img border="0" src="images/14-ResourceHistory.png"/>
+ </p>
+ <p>Create a new Java class HelloWorld and implement it, then add it to version control and commit your change.
+ Improve your implementation and commit the improved class, the resource history should now show 2 commits for this class.</p>
+ <p>
+ <img border="0" src="images/15-FirstImplementation.png"/>
+ </p>
+ <p>Double click "src/HelloWorld.java" in the Resource History View to open your last committed change in the Eclipse compare view</p>
+ <p>
+ <img border="0" src="images/16-ShowChange.png"/>
+ </p><hr/>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <td style="width: 20%" align="left"></td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right">
+ <a href="Adding-a-project-to-version-control.html" title="Adding a project to version control">
+ <img alt="Next" border="0" src="images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top"></td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Adding a project to version control</td>
+ </tr>
+ </table>
+ </body>
+</html>
diff --git a/org.eclipse.egit.doc/userguide/Inspecting-the-state-of-the-Repository.html b/org.eclipse.egit.doc/userguide/Inspecting-the-state-of-the-Repository.html
new file mode 100644
index 0000000000..1cbceadbed
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/Inspecting-the-state-of-the-Repository.html
@@ -0,0 +1,164 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title>EGit User Guide - Inspecting the state of the Repository</title>
+ <link type="text/css" rel="stylesheet" href="book.css"/>
+ </head>
+ <body>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <th style="width: 100%" align="center" colspan="3">Inspecting the state of the Repository</th>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="Working-with-remote-Repositories.html" title="Working with remote Repositories">
+ <img alt="Previous" border="0" src="images/prev.gif"/>
+ </a>
+ </td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right">
+ <a href="Committing-changes.html" title="Committing changes">
+ <img alt="Next" border="0" src="images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top">Working with remote Repositories</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Committing changes</td>
+ </tr>
+ </table><hr/>
+ <h1 id="Inspecting_the_state_of_the_Repository">Inspecting the state of the Repository</h1>
+ <h2 id="Label_Decorations">Label Decorations</h2>
+ <p>Label decorations show Git specific information on resources under Git version control. They appear in all views showing model objects, like Package Explorer, Project Explorer, Navigator, Hierarchy View.</p>
+ <p>The Git label decorations can be switched on globally in the Preference Menu (Window -> Preferences) under General -> Appearance -> Label Decorations. </p>
+ <p>More detailed settings can be done in the Preferences under Team -> Git -> Label Decorations.</p>
+ <p>There are two different types of label decorations: text decorations and icon decorations.</p>
+ <p>
+ <b>Text Decorations</b>
+ <br/>
+ Text decorations appear on the left or right side of the text label. They can be configured on the Preferences dialog under Team -> Git -> Label Decorations on the tab "Text Decorations". For example, he default for a dirty resource is a > on the left side of its name.
+ </p>
+ <p>These are the default settings:</p>
+ <p>
+ <img border="0" src="images/01-TextDecorations.png"/>
+ </p>
+ <p>For files and folders there are the variables "name", "dirty" and "staged". "Dirty" and "staged" are flags; if they are true, the text after the colon is displayed. For the project name there is additionally the variable "branch". If no branch is checked out the decoration shows the name of the commit.</p>
+ <p>
+ <b>Icon Decorations</b>
+ <br/>
+ Icon decorations appear on the lower left corner of the icon label. They can be configured on the Preferences dialog under Team -> Git -> Label Decorations on the tab "Icon Decorations".
+ </p>
+ <p>These are the default decorations:</p>
+ <p>
+ <img border="0" src="images/02-IconDecorations.png"/>
+ </p>
+ <ul>
+ <li>
+ <b>dirty (folder)</b> - At least one file below the folder is dirty; that means that it has changes in the working tree that are neither in the index nor in the repository.
+ </li>
+ <li>
+ <b>tracked</b> - The resource is known to the Git repository.
+ </li>
+ <li>
+ <b>untracked</b> - The resource is not known to the Git repository.
+ </li>
+ <li>
+ <b>ignored</b> - The resource is ignored by the Git team provider. Here only the preference settings under Team -> Ignored Resources and the "derived" flag are relevant. The .gitignore file is not taken into account.
+ </li>
+ <li>
+ <b>dirty</b> - The resource has changes in the working tree that are neither in the index nor in the repository.
+ </li>
+ <li>
+ <b>staged</b> - The resource has changes which are added to the index. Not that adding to the index is possible at the moment only on the commit dialog on the context menu of a resource.
+ </li>
+ <li>
+ <b>partially-staged</b> - The resource has changes which are added to the index and additionally changes in the working tree that are neither in the index nor in the repository.
+ </li>
+ <li>
+ <b>added</b> - The resource is not yet tracked by but added to the Git repository.
+ </li>
+ <li>
+ <b>removed</b> - The resource is staged for removal from the Git repository.
+ </li>
+ <li>
+ <b>conflict</b> - A merge conflict exists for the file.
+ </li>
+ <li>
+ <b>assume-valid</b> - The resource has the "assume unchanged" flag. This means that Git stops checking the working tree files for possible modifications, so you need to manually unset the bit to tell Git when you change the working tree file. This setting can be switched on with the menu action Team->Assume unchanged (or on the command line with git update-index --assume-unchanged).
+ </li>
+ </ul>
+ <h2 id="Commit_dialog">Commit dialog</h2>
+ <p>A summary of the status of all changed tracked files can be seen on the commit dialog.</p>
+ <h2 id="Comparing_Content">Comparing Content</h2>
+ <p>In daily work most commonly you will want to see the changes between your last commit, your index, and your current working tree.</p>
+ <p>
+ <b>Compare working tree with index</b>
+ <br/>
+ The difference between the current working directory and the index can be viewed from the context menu Compare With -> Git Index.
+ </p>
+ <p>
+ <img border="0" src="images/03-CompareWithIndex.png"/>
+ </p>
+ <p>
+ <b>Compare working tree with last commit</b>
+ <br/>
+ This feature is not implemented yet. As a manual workaround you can view the content of the file after your last commit from the History View (Team -> Show in Resource History). Here you can see the differences between a commit and its parent by double-clicking on the entry in the Path-column on the lower right. You also can use Quickdiff (see below) by choose HEAD as quick baseline.
+ </p>
+ <p>
+ <b>Compare index with last commit</b>
+ <br/>
+ This feature is not implemented yet.(As a manual workaround you can view the content of the file after your last commit from the History View (Team -> Show in Resource History). Here you can see the differences between a commit and its parent by double-clicking on the entry in the Path-column on the lower right.
+ </p>
+ <h2 id="Quickdiff">Quickdiff</h2>
+ <p>Instead of using a compare editor you can enable quick diff support and see the changes within the text editor. This feature can be enabled via the General > Editors > Text Editors > Quick Diff preference page:</p>
+ <p>
+ <img border="0" src="images/04-QuickDiffPreferences.png"/>
+ </p>
+ <p>You then will see the difference annotation on the left hand side of the editor:</p>
+ <p>
+ <img border="0" src="images/05-QuickDiffInEditor.png"/>
+ </p>
+ <p>If you move your mouse over the annotation you see the content of the version you are comparing to:</p>
+ <p>
+ <img border="0" src="images/06-QuickDiffInEditorPopup.png"/>
+ </p>
+ <p>Per default, the comparison is against the HEAD. You can determine the version you are comparing to, the so-called quickdiff baseline, from the context menu of a commit in the history view (Team -> Show in Resource History). Here are three menu entries:</p>
+ <ul>
+ <li>
+ <b>Set as quickdiff baseline</b> - Compare against the selected commit
+ </li>
+ <li>
+ <b>Reset quickdiff baseline to HEAD</b> - Compare against HEAD.
+ </li>
+ <li>
+ <b>Reset quickdiff baseline to first parent of HEAD</b> - Compare against the first commit before HEAD.
+ </li>
+ </ul><hr/>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="Working-with-remote-Repositories.html" title="Working with remote Repositories">
+ <img alt="Previous" border="0" src="images/prev.gif"/>
+ </a>
+ </td>
+ <td style="width: 60%" align="center">
+ <a href="EGit User Guide.html" title="EGit User Guide">
+ <img alt="EGit User Guide" border="0" src="images/home.gif"/>
+ </a>
+ </td>
+ <td style="width: 20%" align="right">
+ <a href="Committing-changes.html" title="Committing changes">
+ <img alt="Next" border="0" src="images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top">Working with remote Repositories</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Committing changes</td>
+ </tr>
+ </table>
+ </body>
+</html>
diff --git a/org.eclipse.egit.doc/userguide/Updating-This-Document.html b/org.eclipse.egit.doc/userguide/Updating-This-Document.html
new file mode 100644
index 0000000000..04d3e92d76
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/Updating-This-Document.html
@@ -0,0 +1,54 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title>EGit User Guide - Updating This Document</title>
+ <link type="text/css" rel="stylesheet" href="book.css"/>
+ </head>
+ <body>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <th style="width: 100%" align="center" colspan="3">Updating This Document</th>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="Committing-changes.html" title="Committing changes">
+ <img alt="Previous" border="0" src="images/prev.gif"/>
+ </a>
+ </td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right"></td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top">Committing changes</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top"></td>
+ </tr>
+ </table><hr/>
+ <h1 id="Updating_This_Document">Updating This Document</h1>
+ <p>This document is maintained in a collaborative wiki. If you wish to update or modify this document please visit
+
+ <a href="http://wiki.eclipse.org/EGit/User_Guide" target="mylyn_external">http://wiki.eclipse.org/EGit/User_Guide</a>
+ </p><hr/>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="Committing-changes.html" title="Committing changes">
+ <img alt="Previous" border="0" src="images/prev.gif"/>
+ </a>
+ </td>
+ <td style="width: 60%" align="center">
+ <a href="EGit User Guide.html" title="EGit User Guide">
+ <img alt="EGit User Guide" border="0" src="images/home.gif"/>
+ </a>
+ </td>
+ <td style="width: 20%" align="right"></td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top">Committing changes</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top"></td>
+ </tr>
+ </table>
+ </body>
+</html>
diff --git a/org.eclipse.egit.doc/userguide/Working-with-remote-Repositories.html b/org.eclipse.egit.doc/userguide/Working-with-remote-Repositories.html
new file mode 100644
index 0000000000..9421b19b4e
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/Working-with-remote-Repositories.html
@@ -0,0 +1,240 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title>EGit User Guide - Working with remote Repositories</title>
+ <link type="text/css" rel="stylesheet" href="book.css"/>
+ </head>
+ <body>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <th style="width: 100%" align="center" colspan="3">Working with remote Repositories</th>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="Creating-a-new-empty-Git-Repository.html" title="Creating a new empty Git Repository">
+ <img alt="Previous" border="0" src="images/prev.gif"/>
+ </a>
+ </td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right">
+ <a href="Inspecting-the-state-of-the-Repository.html" title="Inspecting the state of the Repository">
+ <img alt="Next" border="0" src="images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top">Creating a new empty Git Repository</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Inspecting the state of the Repository</td>
+ </tr>
+ </table><hr/>
+ <h1 id="Working_with_remote_Repositories">Working with remote Repositories</h1>
+ <h2 id="Cloning_remote_Repositories">Cloning remote Repositories</h2>
+ <p>Using the Git import wizard you can clone remote repositories using different transport protocols.
+ Additionally you may import existing Eclipse projects into your workspace and share the projects with the Git team provider. </p>
+ <p>Start the import wizard by navigating to File -> Import... and choose "Git Repository".</p>
+ <p>
+ <img border="0" src="images/01-CloneExistingRepository.png"/>
+ </p>
+ <h3 id="Repository_Selection">Repository Selection</h3>
+ <p>On the first page of the wizard enter the location of the remote repository:</p>
+ <p>
+ <img border="0" src="images/02-GitProtocol.png"/>
+ </p>
+ <ul>
+ <li>
+ <b>URI</b> - The complete URI of the remote repository or the path on the file system. This field is automatically synchronized with the other fields.
+ </li>
+ <li>
+ <b>Host</b> - The name of the remote host or empty if cloning from the file system.
+ </li>
+ <li>
+ <b>Repository Path</b> - Path to the remote repository or on the file system.
+ </li>
+ <li>
+ <b>Protocol</b> - One of the protocols described below.
+ </li>
+ <li>
+ <b>Port</b> - Port number.
+ </li>
+ <li>
+ <b>User</b> - The user name used for authentication.
+ </li>
+ <li>
+ <b>Password</b> The password used for authentication.
+ </li>
+ </ul>
+ <p>The following protocols are supported:</p>
+ <ul>
+ <li>
+ <b>git</b> - The most efficient built-in git protocol (default port 9418). This protocol doesn't provide authentication. Typically used for anonymous read access to the repository.
+ </li>
+ <li>
+ <b>git+ssh</b> - Git over
+ <a href="http://tools.ietf.org/html/rfc4251" target="mylyn_external">secure shell (SSH)</a> protocol. Typically used for authenticated write access to the repository.
+ </li>
+ <li>
+ <b>sftp</b> -
+ <a href="http://en.wikipedia.org/wiki/SSH_File_Transfer_Protocol" target="mylyn_external">SSH File Transfer Protocol</a>
+ </li>
+ <li>
+ <b>http</b> -
+ <a href="http://tools.ietf.org/html/rfc2616" target="mylyn_external">Hypertext Transfer Protocol</a> can be tunneled through firewalls.
+ </li>
+ <li>
+ <b>https</b> -
+ <a href="http://tools.ietf.org/html/rfc2818" target="mylyn_external">Hypertext Transfer Protocol Secure</a> can be tunneled through firewalls.
+ </li>
+ <li>
+ <b>ftp</b> -
+ <a href="http://tools.ietf.org/html/rfc959" target="mylyn_external">File Transfer Protocol</a>
+ </li>
+ <li>
+ <b>file</b> - File system access to the repository.
+ </li>
+ </ul>
+ <h3 id="Branch_selection">Branch selection</h3>
+ <p>On the next page choose which branch should be cloned from the remote repository:</p>
+ <p>
+ <img border="0" src="images/05-branches.png"/>
+ </p>
+ <h3 id="Local_Destination">Local Destination</h3>
+ <p>On the next page define where you want to store the repository on your file system and define some initial settings.</p>
+ <p>
+ <img border="0" src="images/06-LocalStorage.png"/>
+ </p>
+ <ul>
+ <li>
+ <b>Directory</b> - The directory which will contain the Git repository. It will be created by the wizard if it does not yet exist.
+ </li>
+ <li>
+ <b>Initial branch</b> - Choose here which local branch will be created and checked out.
+ </li>
+ <li>
+ <b>Remote name</b> - Define a name for the remote repository. The default is "origin".
+ </li>
+ <li>
+ <b>Import projects after clone</b> - If checked, the repository is searched for eclipse projects. In this case the finish button is disabled and the wizard continues with the project selection. If not checked, the finish button is enabled.
+ </li>
+ </ul>
+ <p>Note that if you press "Next" on this page the repository will immediately be cloned by the wizard. This is necessary to find the eclipse projects. If you end the wizard with the "Cancel" button later on you will be asked if the clone should be deleted.</p>
+ <h3 id="Import_Projects">Import Projects</h3>
+ <p>On the next page the Eclipse projects found in the cloned repository are presented.</p>
+ <p>
+ <img border="0" src="images/07-ImportProjects.png"/>
+ </p>
+ <ul>
+ <li>
+ <b>Enable Git Team operations on imported projects</b> - If this checkbox is selected the imported project are shared with the EGit Team provider. If it is not checked, the Team operations can still be enabled later on by choosing the project in eclipse and selecting Team -> Share Project...
+ </li>
+ </ul>
+ <h2 id="Pushing_a_Local_Repository_to_GitHub">Pushing a Local Repository to GitHub</h2>
+ <h3 id="Create_Local_Repository">Create Local Repository</h3>
+ <ul>
+ <li>follow
+ <a href="http://wiki.eclipse.org/EGit/User_Guide/Getting_Started" title="EGit/User Guide/Getting Started" target="mylyn_external">EGit/User Guide/Getting Started</a> to create a new local repository (with your content instead of the demo project)
+ </li>
+ </ul>
+ <h3 id="Create_Repository_at_GitHub">Create Repository at GitHub</h3>
+ <ul>
+ <li>create a new repository at GitHub</li>
+ </ul>
+ <p>
+ <img border="0" src="images/egit-0.6-001-CreateRepoAtGithub.png"/>
+ </p>
+ <ul>
+ <li>you get a fresh clone URL for this new repository</li>
+ </ul>
+ <p>
+ <img border="0" src="images/egit-0.6-002-CloneUrl.png"/>
+ </p>
+ <h3 id="Eclipse_SSH_Configuration">Eclipse SSH Configuration</h3>
+ <ul>
+ <li>open "Window" > "Preferences" and ensure that your SSH2 home is configured correctly (usually this is ~/.ssh) and contains your SSH2 keys (upload your public key to your GitHub account settings)</li>
+ </ul>
+ <p>
+ <img border="0" src="images/egit-0.6-003-SshPreferences.png"/>
+ </p>
+ <ul>
+ <li>if you don't have SSH keys yet you may generate them on the second tab "Key Management" of this dialog, use a good pass phrase to protect your private key, for more details see
+ <a href="http://help.github.com/working-with-key-passphrases/" target="mylyn_external">"working with key passphrases"</a>
+ </li>
+ </ul>
+ <h3 id="Push_Upstream">Push Upstream</h3>
+ <ul>
+ <li>Select your new Eclipse project and click "Team" > "Push To" and enter "Your GitHub Clone URL" and your GitHub password(with the free github accoutns do not enter a password but leave blank), leave the user as "git"</li>
+ </ul>
+ <p>
+ <img border="0" src="images/egit-0.6-004-PushDialog.png"/>
+ </p>
+ <ul>
+ <li>click "Next" and on first connection accept GitHub's host key</li>
+ </ul>
+ <p>
+ <img border="0" src="images/egit-0.6-005-AcceptHostKey.png"/>
+ </p>
+ <ul>
+ <li>enter your SSH key's passphrase</li>
+ </ul>
+ <p>
+ <img border="0" src="images/egit-0.6-006-PassPhrase.png"/>
+ </p>
+ <ul>
+ <li>enter as source ref: refs/heads/master and as target ref: refs/heads/master and click button "Add all branches spec"</li>
+ </ul>
+ <p>
+ <img border="0" src="images/egit-0.6-007-PushRefSpecifications.png"/>
+ </p>
+ <ul>
+ <li>click "Next" and click "Finish" to confirm the push</li>
+ </ul>
+ <p>
+ <img border="0" src="images/egit-0.6-008-PushConfirmation.png"/>
+ </p>
+ <ul>
+ <li>the next dialog shows the result of the push operation</li>
+ </ul>
+ <p>
+ <img border="0" src="images/egit-0.6-009-PushResult.png"/>
+ </p>
+ <ul>
+ <li>point your browser at your GitHub repository to see that your new repository content has arrived</li>
+ </ul>
+ <p>
+ <img border="0" src="images/egit-0.6-010-PushResultOnGithub.png"/>
+ </p>
+ <h2 id="Pulling_.28merge_or_rebase.29_new_changes_from_upstream">Pulling (merge or rebase) new changes from upstream</h2>
+ <p>This is not yet available. Available alternatives currently include:</p>
+ <ul>
+ <li>run "git pull" from outside eclipse (but
+ <a href="http://marc.info/?l=git&amp;m=123924844219075" target="mylyn_external">beware on Windows</a>)
+ </li>
+ <li>if you did no local change or want to discard your local changes, use "Team/Reset To..."</li>
+ </ul><hr/>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="Creating-a-new-empty-Git-Repository.html" title="Creating a new empty Git Repository">
+ <img alt="Previous" border="0" src="images/prev.gif"/>
+ </a>
+ </td>
+ <td style="width: 60%" align="center">
+ <a href="EGit User Guide.html" title="EGit User Guide">
+ <img alt="EGit User Guide" border="0" src="images/home.gif"/>
+ </a>
+ </td>
+ <td style="width: 20%" align="right">
+ <a href="Inspecting-the-state-of-the-Repository.html" title="Inspecting the state of the Repository">
+ <img alt="Next" border="0" src="images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top">Creating a new empty Git Repository</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Inspecting the state of the Repository</td>
+ </tr>
+ </table>
+ </body>
+</html>
diff --git a/org.eclipse.egit.doc/userguide/images/01-CloneExistingRepository.png b/org.eclipse.egit.doc/userguide/images/01-CloneExistingRepository.png
new file mode 100644
index 0000000000..879f0308b9
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/01-CloneExistingRepository.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/01-CreateNewJavaProject.png b/org.eclipse.egit.doc/userguide/images/01-CreateNewJavaProject.png
new file mode 100644
index 0000000000..d9865de523
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/01-CreateNewJavaProject.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/01-TextDecorations.png b/org.eclipse.egit.doc/userguide/images/01-TextDecorations.png
new file mode 100644
index 0000000000..a5f406ef39
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/01-TextDecorations.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/02-GitProtocol.png b/org.eclipse.egit.doc/userguide/images/02-GitProtocol.png
new file mode 100644
index 0000000000..b6b7cbbed7
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/02-GitProtocol.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/02-IconDecorations.png b/org.eclipse.egit.doc/userguide/images/02-IconDecorations.png
new file mode 100644
index 0000000000..c15feb4b1d
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/02-IconDecorations.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/02-TeamShareProject.png b/org.eclipse.egit.doc/userguide/images/02-TeamShareProject.png
new file mode 100644
index 0000000000..cf0851f7fc
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/02-TeamShareProject.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/03-CompareWithIndex.png b/org.eclipse.egit.doc/userguide/images/03-CompareWithIndex.png
new file mode 100644
index 0000000000..1b2a3bdd86
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/03-CompareWithIndex.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/03-SelectRepositoryTypeGit.png b/org.eclipse.egit.doc/userguide/images/03-SelectRepositoryTypeGit.png
new file mode 100644
index 0000000000..7c6e5cb740
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/03-SelectRepositoryTypeGit.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/04-QuickDiffPreferences.png b/org.eclipse.egit.doc/userguide/images/04-QuickDiffPreferences.png
new file mode 100644
index 0000000000..524ac40dd1
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/04-QuickDiffPreferences.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/04-SelectProjectToConfigureGitRepository.png b/org.eclipse.egit.doc/userguide/images/04-SelectProjectToConfigureGitRepository.png
new file mode 100644
index 0000000000..cb254aadaf
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/04-SelectProjectToConfigureGitRepository.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/05-CreateNewGitRepository.png b/org.eclipse.egit.doc/userguide/images/05-CreateNewGitRepository.png
new file mode 100644
index 0000000000..e08fe1d4e1
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/05-CreateNewGitRepository.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/05-QuickDiffInEditor.png b/org.eclipse.egit.doc/userguide/images/05-QuickDiffInEditor.png
new file mode 100644
index 0000000000..55ef3026d1
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/05-QuickDiffInEditor.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/05-branches.png b/org.eclipse.egit.doc/userguide/images/05-branches.png
new file mode 100644
index 0000000000..f782c8572c
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/05-branches.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/06-LocalStorage.png b/org.eclipse.egit.doc/userguide/images/06-LocalStorage.png
new file mode 100644
index 0000000000..6eb142711c
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/06-LocalStorage.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/06-NewGitRepository.png b/org.eclipse.egit.doc/userguide/images/06-NewGitRepository.png
new file mode 100644
index 0000000000..954bb3ba1f
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/06-NewGitRepository.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/06-QuickDiffInEditorPopup.png b/org.eclipse.egit.doc/userguide/images/06-QuickDiffInEditorPopup.png
new file mode 100644
index 0000000000..e1b4baa011
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/06-QuickDiffInEditorPopup.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/07-AddToVersionControl.png b/org.eclipse.egit.doc/userguide/images/07-AddToVersionControl.png
new file mode 100644
index 0000000000..7fc1179960
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/07-AddToVersionControl.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/07-ImportProjects.png b/org.eclipse.egit.doc/userguide/images/07-ImportProjects.png
new file mode 100644
index 0000000000..8af9ec838a
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/07-ImportProjects.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/08-AddedToVersionControl.png b/org.eclipse.egit.doc/userguide/images/08-AddedToVersionControl.png
new file mode 100644
index 0000000000..10099d9dba
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/08-AddedToVersionControl.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/09-IgnoredResources.png b/org.eclipse.egit.doc/userguide/images/09-IgnoredResources.png
new file mode 100644
index 0000000000..11a5fb6138
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/09-IgnoredResources.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/10-ClickCommit.png b/org.eclipse.egit.doc/userguide/images/10-ClickCommit.png
new file mode 100644
index 0000000000..fed2098936
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/10-ClickCommit.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/11-CommitDialog.png b/org.eclipse.egit.doc/userguide/images/11-CommitDialog.png
new file mode 100644
index 0000000000..fe4788cf15
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/11-CommitDialog.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/12-CommittedFiles.png b/org.eclipse.egit.doc/userguide/images/12-CommittedFiles.png
new file mode 100644
index 0000000000..f6a4f1185d
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/12-CommittedFiles.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/13-SelectResourceHistory.png b/org.eclipse.egit.doc/userguide/images/13-SelectResourceHistory.png
new file mode 100644
index 0000000000..accaaae48e
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/13-SelectResourceHistory.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/14-ResourceHistory.png b/org.eclipse.egit.doc/userguide/images/14-ResourceHistory.png
new file mode 100644
index 0000000000..20dcce7905
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/14-ResourceHistory.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/15-FirstImplementation.png b/org.eclipse.egit.doc/userguide/images/15-FirstImplementation.png
new file mode 100644
index 0000000000..cc81f599f2
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/15-FirstImplementation.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/16-ShowChange.png b/org.eclipse.egit.doc/userguide/images/16-ShowChange.png
new file mode 100644
index 0000000000..1bd30f2ff5
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/16-ShowChange.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/EGit_AddFile.png b/org.eclipse.egit.doc/userguide/images/EGit_AddFile.png
new file mode 100644
index 0000000000..a52ace5bd9
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/EGit_AddFile.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/EGit_AddedAndModifiedFiles.png b/org.eclipse.egit.doc/userguide/images/EGit_AddedAndModifiedFiles.png
new file mode 100644
index 0000000000..4749e5b32c
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/EGit_AddedAndModifiedFiles.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/EGit_AmendBringsOldCommitMessage.png b/org.eclipse.egit.doc/userguide/images/EGit_AmendBringsOldCommitMessage.png
new file mode 100644
index 0000000000..fc1d510420
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/EGit_AmendBringsOldCommitMessage.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/EGit_Commit.png b/org.eclipse.egit.doc/userguide/images/EGit_Commit.png
new file mode 100644
index 0000000000..a1c067797d
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/EGit_Commit.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/EGit_CommitDialog.png b/org.eclipse.egit.doc/userguide/images/EGit_CommitDialog.png
new file mode 100644
index 0000000000..d71a807c41
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/EGit_CommitDialog.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/EGit_Corrected.png b/org.eclipse.egit.doc/userguide/images/EGit_Corrected.png
new file mode 100644
index 0000000000..bd6e584f61
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/EGit_Corrected.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/EGit_Typo.png b/org.eclipse.egit.doc/userguide/images/EGit_Typo.png
new file mode 100644
index 0000000000..f744104929
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/EGit_Typo.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/Egit-0.6-001-CreateRepoAtGithub.png b/org.eclipse.egit.doc/userguide/images/Egit-0.6-001-CreateRepoAtGithub.png
new file mode 100644
index 0000000000..baafa6b0c3
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/Egit-0.6-001-CreateRepoAtGithub.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/Egit-0.6-002-CloneUrl.png b/org.eclipse.egit.doc/userguide/images/Egit-0.6-002-CloneUrl.png
new file mode 100644
index 0000000000..a1cdd18d2f
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/Egit-0.6-002-CloneUrl.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/Egit-0.6-003-SshPreferences.png b/org.eclipse.egit.doc/userguide/images/Egit-0.6-003-SshPreferences.png
new file mode 100644
index 0000000000..4c86bb75a3
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/Egit-0.6-003-SshPreferences.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/Egit-0.6-004-PushDialog.png b/org.eclipse.egit.doc/userguide/images/Egit-0.6-004-PushDialog.png
new file mode 100644
index 0000000000..f9d28a3d2d
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/Egit-0.6-004-PushDialog.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/Egit-0.6-005-AcceptHostKey.png b/org.eclipse.egit.doc/userguide/images/Egit-0.6-005-AcceptHostKey.png
new file mode 100644
index 0000000000..f07b33a87b
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/Egit-0.6-005-AcceptHostKey.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/Egit-0.6-006-PassPhrase.png b/org.eclipse.egit.doc/userguide/images/Egit-0.6-006-PassPhrase.png
new file mode 100644
index 0000000000..4a28efd9eb
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/Egit-0.6-006-PassPhrase.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/Egit-0.6-007-PushRefSpecifications.png b/org.eclipse.egit.doc/userguide/images/Egit-0.6-007-PushRefSpecifications.png
new file mode 100644
index 0000000000..207ea0f030
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/Egit-0.6-007-PushRefSpecifications.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/Egit-0.6-008-PushConfirmation.png b/org.eclipse.egit.doc/userguide/images/Egit-0.6-008-PushConfirmation.png
new file mode 100644
index 0000000000..20acf4cad7
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/Egit-0.6-008-PushConfirmation.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/Egit-0.6-009-PushResult.png b/org.eclipse.egit.doc/userguide/images/Egit-0.6-009-PushResult.png
new file mode 100644
index 0000000000..e8dcc666e7
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/Egit-0.6-009-PushResult.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/Egit-0.6-010-PushResultOnGithub.png b/org.eclipse.egit.doc/userguide/images/Egit-0.6-010-PushResultOnGithub.png
new file mode 100644
index 0000000000..88a0ac5114
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/Egit-0.6-010-PushResultOnGithub.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/Warning2.png b/org.eclipse.egit.doc/userguide/images/Warning2.png
new file mode 100644
index 0000000000..15be630e77
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/Warning2.png
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/home.gif b/org.eclipse.egit.doc/userguide/images/home.gif
new file mode 100644
index 0000000000..4472e8ce5b
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/home.gif
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/next.gif b/org.eclipse.egit.doc/userguide/images/next.gif
new file mode 100644
index 0000000000..e2f8c3e1fe
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/next.gif
Binary files differ
diff --git a/org.eclipse.egit.doc/userguide/images/prev.gif b/org.eclipse.egit.doc/userguide/images/prev.gif
new file mode 100644
index 0000000000..4fb4150103
--- /dev/null
+++ b/org.eclipse.egit.doc/userguide/images/prev.gif
Binary files differ

Back to the top