Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2014-09-26 09:56:22 -0400
committerMatthias Sohn2014-09-26 09:57:21 -0400
commitac7639a244f5caf530b26fccbf3b7817cb72b491 (patch)
treee1350834e140f85ce534e7227378ea2aec28bd74
parentf812540fa95ae0f89d853bce880920d7a2c22b17 (diff)
parent5139e5baaf95226d6f25dccabfd4bcfc3eb9f14e (diff)
downloadegit-ac7639a244f5caf530b26fccbf3b7817cb72b491.tar.gz
egit-ac7639a244f5caf530b26fccbf3b7817cb72b491.tar.xz
egit-ac7639a244f5caf530b26fccbf3b7817cb72b491.zip
Merge branch 'stable-3.5'
* stable-3.5: Prepare 3.5.1-SNAPSHOT builds EGit v3.5.0.201409260305-r New EGit project logo (SVG) Add EGit Contributor Guide to documentation Update documentation for 3.5.0 New EGit project logo Include word "Edit" in tooltip of "Amend" toolbar button Extended squash_down.png icon to 16x16 pixels Improve icons for interactive rebase fixup and squash actions Remove use of alternating row colors in some more places Fix deadlock caused by GitProjectData.logAndUnmapGoneMappedResource [stagingView] Fix context menu for modified+added file Add "Repository" submenu in Team menu of files and folders Fix Team > Advanced not being available in editor context menu Add Team > "Create Patch..." for working sets Add Team > "Show in History/Repositories View" for working sets Prepare post 3.5.0-rc1 builds EGit 3.5.0.201409071800-rc1 Change-Id: Iad4c73fe5b56dad669a59e194e37b202b72c89d1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.egit.core/src/org/eclipse/egit/core/internal/CoreText.java3
-rw-r--r--org.eclipse.egit.core/src/org/eclipse/egit/core/internal/coretext.properties1
-rw-r--r--org.eclipse.egit.core/src/org/eclipse/egit/core/project/GitProjectData.java29
-rw-r--r--org.eclipse.egit.doc/build-help.xml5
-rw-r--r--org.eclipse.egit.doc/help/EGit/Contributor_Guide/Bugs.html271
-rw-r--r--org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html219
-rw-r--r--org.eclipse.egit.doc/help/EGit/Contributor_Guide/Contributing-Patches.html414
-rw-r--r--org.eclipse.egit.doc/help/EGit/Contributor_Guide/Contributor-Guide.html89
-rw-r--r--org.eclipse.egit.doc/help/EGit/Contributor_Guide/Development-IDE-Configuration.html152
-rw-r--r--org.eclipse.egit.doc/help/EGit/Contributor_Guide/Documentation.html80
-rw-r--r--org.eclipse.egit.doc/help/EGit/Contributor_Guide/Gerrit-Code-Review-Cheatsheet.html182
-rw-r--r--org.eclipse.egit.doc/help/EGit/Contributor_Guide/Obtaining-Sources.html120
-rw-r--r--org.eclipse.egit.doc/help/EGit/Contributor_Guide/Tests.html112
-rw-r--r--org.eclipse.egit.doc/help/EGit/Contributor_Guide/Updating-This-Document.html55
-rw-r--r--org.eclipse.egit.doc/help/EGit/Contributor_Guide/Website.html100
-rw-r--r--org.eclipse.egit.doc/help/EGit/Contributor_Guide/images/EGit-Target-Platforms.pngbin0 -> 11786 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/Contributor_Guide/images/Start-swtbot-test.pngbin0 -> 26374 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html8
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.4/3.4.html93
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/3.5.html178
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/Bug-Fixes.html (renamed from org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.4/Bug-Fixes.html)16
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/Contributors.html (renamed from org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.4/Contributors.html)29
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/Updating-This-Document.html (renamed from org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.4/Updating-This-Document.html)8
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/EGit-3.5-repository-submenu.pngbin0 -> 16547 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/EGit-3.5-stash-toolbar.pngbin0 -> 6896 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/EGit-3.5-stash-viewer.pngbin0 -> 27174 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/EGit-3.5-working-set-team-menu.pngbin0 -> 27960 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/Egit-3.5-annotations-in-ruler.pngbin0 -> 23178 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/Egit-3.5-history-delete-tag.pngbin0 -> 28549 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/Egit-3.5-history-find-tag-branch.pngbin0 -> 42819 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/Egit-3.5-interactive-rebase-plan-menu.pngbin0 -> 14946 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/Egit-3.5-interactive-rebase.pngbin0 -> 23412 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/Egit-3.5-multi-cherry-pick.pngbin0 -> 26692 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/Egit-3.5-rebase-options.pngbin0 -> 19252 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html74
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/User-Guide.html21
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-0.10-RebaseConflictDialog.pngbin12565 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-0.7-ViewDiffInResourceHistory.pngbin16989 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-ConfirmProjectRemoval.pngbin16805 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-ConfirmRepositoryDeletion.pngbin12887 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-repoview-refmenu.pngbin6006 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-BranchCreationDialog.pngbin12206 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-ConfigureFetchFromUpstream.pngbin14507 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-ConfigurePushToUpstream.pngbin15204 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-FetchResultDialog.pngbin11048 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-fetchChangeFromGerritDialog.pngbin22688 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-workbench-menu.pngbin11859 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-workbench-toolbar.pngbin4516 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-tag-create.pngbin4130 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-tag-replace.pngbin4610 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-commit-dialog-amend.pngbin8511 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-fetch-wizard-result.pngbin17014 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-push-result.pngbin16831 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.0-blame-ruler.pngbin24789 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-project-menu-advanced.pngbin29910 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-project-menu-main.pngbin13888 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-project-menu-remote.pngbin5871 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-repoview-branch-menu.pngbin8843 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-repoview-fetchconfig-menu.pngbin9493 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-repoview-pushconfig-menu.pngbin8351 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-repoview-repository-menu.pngbin27145 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-repoview-tag-menu.pngbin7147 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-repoview-workingtree-menu.pngbin6744 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-resource-menu.pngbin11796 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-staging-view.pngbin18541 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-2.1-history-view-menu.pngbin50048 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-2.1-pushChangeToGerritDialog.pngbin24373 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-3.1-CreateBranchDialog.pngbin14707 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-3.5-ConfigureBranchDialog.pngbin0 -> 8946 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-3.5-CreateBranchDialog.pngbin0 -> 12464 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Filters.pngbin40666 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Git_merge_conflict.pngbin0 -> 78853 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/MergeDialog.pngbin22435 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/MergeResultMerged.pngbin11980 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/TagCreation.pngbin20395 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.5/3.5.html (renamed from org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.4/3.4.html)54
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.5/Bug-Fixes.html (renamed from org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.4/Bug-Fixes.html)16
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.5/Contributors.html (renamed from org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.4/Contributors.html)51
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.5/Updating-This-Document.html (renamed from org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.4/Updating-This-Document.html)8
-rw-r--r--org.eclipse.egit.doc/help/JGit/User_Guide/User-Guide.html2
-rw-r--r--org.eclipse.egit.doc/help/toc.xml146
-rw-r--r--org.eclipse.egit.target/pom.xml2
-rw-r--r--org.eclipse.egit.ui/icons/obj16/fixup-down.pngbin0 -> 382 bytes
-rw-r--r--org.eclipse.egit.ui/icons/obj16/fixup-up.pngbin0 -> 358 bytes
-rw-r--r--org.eclipse.egit.ui/icons/obj16/fixup.gifbin299 -> 0 bytes
-rw-r--r--org.eclipse.egit.ui/icons/obj16/squash-down.pngbin0 -> 513 bytes
-rw-r--r--org.eclipse.egit.ui/icons/obj16/squash-up.pngbin0 -> 528 bytes
-rw-r--r--org.eclipse.egit.ui/icons/obj16/squash.gifbin321 -> 0 bytes
-rw-r--r--org.eclipse.egit.ui/plugin.properties2
-rw-r--r--org.eclipse.egit.ui/plugin.xml234
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIIcons.java20
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ActionCommands.java6
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/CreatePatchAction.java22
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ShowHistoryAction.java22
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ShowRepositoriesViewAction.java21
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitSelectDialog.java1
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultTable.java1
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GitCreatePatchWizard.java16
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/MergeResultDialog.java3
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushResultTable.java1
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveStepActionToolBarProvider.java4
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveView.java22
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesView.java7
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/selection/SelectionPropertyTester.java68
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingEntry.java27
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java6
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingViewContentProvider.java8
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties4
-rw-r--r--org.eclipse.egit/egit.pngbin1366 -> 1629 bytes
-rw-r--r--org.eclipse.egit/egit.svg222
110 files changed, 2653 insertions, 602 deletions
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/CoreText.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/CoreText.java
index 51dbc4165..f5036dd9f 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/CoreText.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/CoreText.java
@@ -376,6 +376,9 @@ public class CoreText extends NLS {
public static String GitProjectData_repositoryChangedTaskName;
/** */
+ public static String GitProjectData_UnmapJobName;
+
+ /** */
public static String GitProjectData_UnmappingGoneResourceFailed;
/** */
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/coretext.properties b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/coretext.properties
index 409efc88f..43c1239a9 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/coretext.properties
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/coretext.properties
@@ -150,6 +150,7 @@ GitSubscriberMergeContext_FailedRefreshSyncView=Failed to refresh synchronize vi
GitProjectData_repositoryChangedJobName=Git repository changed
GitProjectData_repositoryChangedTaskName=Git repository changed
+GitProjectData_UnmapJobName=Disconnecting project {0} from Git repository
GitProjectData_UnmappingGoneResourceFailed=Unmapping gone mapped resource {0} failed
GitResourceVariantTreeSubscriber_fetchTaskName=Fetching data from git repositories
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/project/GitProjectData.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/project/GitProjectData.java
index 5ad2ba451..d62e5c5ab 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/project/GitProjectData.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/project/GitProjectData.java
@@ -530,11 +530,8 @@ public class GitProjectData {
CoreText.GitProjectData_mappedResourceGone, m.toString()),
new FileNotFoundException(m.getContainerPath().toString()));
m.clear();
- try {
- RepositoryProvider.unmap(getProject());
- } catch (TeamException e) {
- Activator.logError(CoreText.GitProjectData_UnmappingGoneResourceFailed, e);
- }
+ UnmapJob unmapJob = new UnmapJob(getProject());
+ unmapJob.schedule();
}
private void protect(IResource resource) {
@@ -553,4 +550,26 @@ public class GitProjectData {
c = c.getParent();
}
}
+
+ private static class UnmapJob extends Job {
+
+ private final IProject project;
+
+ private UnmapJob(IProject project) {
+ super(MessageFormat.format(CoreText.GitProjectData_UnmapJobName,
+ project.getName()));
+ this.project = project;
+ }
+
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ try {
+ RepositoryProvider.unmap(project);
+ return Status.OK_STATUS;
+ } catch (TeamException e) {
+ return new Status(IStatus.ERROR, Activator.getPluginId(),
+ CoreText.GitProjectData_UnmappingGoneResourceFailed, e);
+ }
+ }
+ }
}
diff --git a/org.eclipse.egit.doc/build-help.xml b/org.eclipse.egit.doc/build-help.xml
index c5147c4cf..899365741 100644
--- a/org.eclipse.egit.doc/build-help.xml
+++ b/org.eclipse.egit.doc/build-help.xml
@@ -47,9 +47,10 @@
>
<path name="EGit/User_Guide" title="EGit User Guide" />
<path name="JGit/User_Guide" title="JGit User Guide" />
- <path name="EGit/New_and_Noteworthy/3.4" title="EGit 3.4 New and Noteworthy" />
- <path name="JGit/New_and_Noteworthy/3.4" title="JGit 3.4 New and Noteworthy" />
+ <path name="EGit/New_and_Noteworthy/3.5" title="EGit 3.5 New and Noteworthy" />
+ <path name="JGit/New_and_Noteworthy/3.5" title="JGit 3.5 New and Noteworthy" />
<path name="EGit/Git_For_Eclipse_Users" title="Git for Eclipse Users" />
+ <path name="EGit/Contributor_Guide" title="EGit Contributor Guide" />
<stylesheet url="book.css" />
<pageAppendum>
diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Bugs.html b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Bugs.html
new file mode 100644
index 000000000..7877a825e
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Bugs.html
@@ -0,0 +1,271 @@
+<?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 Contributor Guide - Bugs</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">Bugs</th>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="Tests.html" title="Tests">
+ <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="Website.html" title="Website">
+ <img alt="Next" border="0" src="../../images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top">Tests</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Website</td>
+ </tr>
+ </table><hr/>
+ <h1 id="Bugs">Bugs</h1>
+ <p>If you are looking for bugs/enhancements to start contributing, they have the keyword "helpwanted" or "bugday":</p>
+ <p>
+ <a href="https://bugs.eclipse.org/bugs/buglist.cgi?keywords=helpwanted%2C%20bugday%2C%20&amp;keywords_type=anywords&amp;list_id=7364111&amp;resolution=---&amp;query_format=advanced&amp;product=EGit" target="egit_external">EGit bugs with helpwanted or bugday</a>
+ </p>
+ <p>
+ <a href="https://bugs.eclipse.org/bugs/buglist.cgi?keywords=helpwanted%2C%20bugday%2C%20&amp;keywords_type=anywords&amp;list_id=8951656&amp;product=JGit&amp;query_format=advanced&amp;resolution=---" target="egit_external">JGit bugs with helpwanted or bugday</a>
+ </p>
+ <h2 id="Links">Links</h2>
+ <h3 id="Filing_Bugs">Filing Bugs</h3>
+ <p>
+ <a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=EGit&amp;rep_platform=All&amp;op_sys=All" target="egit_external">File a bug for EGit</a>
+ </p>
+ <p>
+ <a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=JGit&amp;rep_platform=All&amp;op_sys=All" target="egit_external">File a bug for JGit</a>
+ </p>
+ <h3 id="Bug_Reports_and_Links">Bug Reports and Links</h3>
+ <table border="1" cellpadding="3" cellspacing="0">
+ <tr>
+ <th>Trends (bugs and enhancements)</th>
+ <th>EGit </th>
+ <th>JGit</th>
+ </tr>
+ <tr>
+ <td>Open by component (date range editable)</td>
+ <td>
+ <a href="https://bugs.eclipse.org/bugs/chart.cgi?category=EGit&amp;datefrom=2011-01-01&amp;dateto=&amp;gt=1&amp;label0=EGit%20Core%20Open&amp;label1=EGit%20UI%20Open&amp;labelgt=Grand%20Total&amp;line0=1480&amp;line1=1478&amp;name=1478&amp;subcategory=UI&amp;action=wrap&amp;width=1000&amp;height=500" target="egit_external">Open</a>
+ </td>
+ <td>
+ <a href="https://bugs.eclipse.org/bugs/chart.cgi?category=JGit&amp;datefrom=2011-01-01&amp;dateto=&amp;label0=JGit%20Open&amp;line0=1592&amp;name=1592&amp;subcategory=JGit&amp;action=wrap&amp;width=1000&amp;height=500" target="egit_external">Open</a>
+ </td>
+ </tr>
+ <tr>
+ <td>Open by status </td>
+ <td>
+ <a href="https://bugs.eclipse.org/bugs/reports.cgi?product=EGit&amp;datasets=NEW&amp;datasets=REOPENED&amp;datasets=UNCONFIRMED&amp;datasets=ASSIGNED" target="egit_external">Open</a>
+ </td>
+ <td>
+ <a href="https://bugs.eclipse.org/bugs/reports.cgi?product=JGit&amp;datasets=NEW&amp;datasets=REOPENED&amp;datasets=UNCONFIRMED&amp;datasets=ASSIGNED" target="egit_external">Open</a>
+ </td>
+ </tr>
+ <tr>
+ <td>Assigned </td>
+ <td>
+ <a href="https://bugs.eclipse.org/bugs/reports.cgi?product=EGit&amp;datasets=ASSIGNED" target="egit_external">Assigned</a>
+ </td>
+ <td>
+ <a href="https://bugs.eclipse.org/bugs/reports.cgi?product=JGit&amp;datasets=ASSIGNED" target="egit_external">Assigned</a>
+ </td>
+ </tr>
+ <tr>
+ <td>Open and closed by status </td>
+ <td>
+ <a href="https://bugs.eclipse.org/bugs/reports.cgi?product=EGit&amp;datasets=NEW&amp;datasets=REOPENED&amp;datasets=UNCONFIRMED&amp;datasets=VERIFIED&amp;datasets=CLOSED&amp;datasets=RESOLVED" target="egit_external">All</a>
+ </td>
+ <td>
+ <a href="https://bugs.eclipse.org/bugs/reports.cgi?product=JGit&amp;datasets=NEW&amp;datasets=REOPENED&amp;datasets=UNCONFIRMED&amp;datasets=VERIFIED&amp;datasets=CLOSED&amp;datasets=RESOLVED" target="egit_external">All</a>
+ </td>
+ </tr>
+ <tr>
+ <th>Lists</th>
+ <th>EGit</th>
+ <th>JGit</th>
+ </tr>
+ <tr>
+ <td><span style="color:red">Unresolved for passed target milestones</span> </td>
+ <td>
+ <a href="https://bugs.eclipse.org/bugs/buglist.cgi?f1=OP&amp;list_id=7727637&amp;f0=OP&amp;classification=Technology&amp;f4=CP&amp;query_format=advanced&amp;j1=OR&amp;f3=CP&amp;f2=everconfirmed&amp;bug_status=UNCONFIRMED&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;product=EGit&amp;target_milestone=0.10.0&amp;target_milestone=0.10.0-M1&amp;target_milestone=0.10.0-M2&amp;target_milestone=0.10.0-M3&amp;target_milestone=0.11&amp;target_milestone=0.11-M1&amp;target_milestone=0.11-M2&amp;target_milestone=0.12&amp;target_milestone=0.12-M1&amp;target_milestone=0.12-M2&amp;target_milestone=0.6.0-M1&amp;target_milestone=0.6.0-M2&amp;target_milestone=0.6.0-M3&amp;target_milestone=0.7.0&amp;target_milestone=0.8.0&amp;target_milestone=0.9.0&amp;target_milestone=0.9.0-M1&amp;target_milestone=0.9.0-M2&amp;target_milestone=0.9.0-M3&amp;target_milestone=1.0.0&amp;target_milestone=1.1&amp;target_milestone=1.1-M1&amp;target_milestone=1.1-M2&amp;target_milestone=1.1-M3&amp;target_milestone=1.2&amp;target_milestone=1.2-M1&amp;target_milestone=1.2-M2&amp;target_milestone=1.3&amp;target_milestone=1.3-M1&amp;target_milestone=2.0&amp;target_milestone=2.0-M1&amp;target_milestone=2.0-M2&amp;target_milestone=2.1&amp;target_milestone=2.1-M1&amp;target_milestone=2.2&amp;target_milestone=2.2-M1&amp;target_milestone=2.2-M2&amp;target_milestone=2.3&amp;target_milestone=2.4&amp;target_milestone=3.0&amp;target_milestone=3.0.1&amp;target_milestone=3.0.2&amp;target_milestone=3.1&amp;target_milestone=3.2" target="egit_external">Open</a>
+ </td>
+ <td>
+ <a href="https://bugs.eclipse.org/bugs/buglist.cgi?f1=OP&amp;list_id=7727591&amp;f0=OP&amp;classification=Technology&amp;f4=CP&amp;query_format=advanced&amp;j1=OR&amp;f3=CP&amp;f2=everconfirmed&amp;bug_status=UNCONFIRMED&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;product=JGit&amp;target_milestone=0.10.0&amp;target_milestone=0.10.0-M1&amp;target_milestone=0.10.0-M2&amp;target_milestone=0.10.0-M3&amp;target_milestone=0.11&amp;target_milestone=0.11-M1&amp;target_milestone=0.11-M2&amp;target_milestone=0.12&amp;target_milestone=0.12-M1&amp;target_milestone=0.12-M2&amp;target_milestone=0.6.0&amp;target_milestone=0.7.0&amp;target_milestone=0.8.0&amp;target_milestone=0.9.0&amp;target_milestone=0.9.0-M1&amp;target_milestone=0.9.0-M2&amp;target_milestone=0.9.0-M3&amp;target_milestone=1.0.0&amp;target_milestone=1.1&amp;target_milestone=1.1-M1&amp;target_milestone=1.1-M2&amp;target_milestone=1.1-M3&amp;target_milestone=1.2&amp;target_milestone=1.2-M1&amp;target_milestone=1.2-M2&amp;target_milestone=1.3&amp;target_milestone=1.3-M1&amp;target_milestone=2.0&amp;target_milestone=2.0-M1&amp;target_milestone=2.0-M2&amp;target_milestone=2.1&amp;target_milestone=2.1-M1&amp;target_milestone=2.2&amp;target_milestone=2.2-M1&amp;target_milestone=2.2-M2&amp;target_milestone=2.3&amp;target_milestone=2.4&amp;target_milestone=3.0&amp;target_milestone=3.0.2&amp;target_milestone=3.1&amp;target_milestone=3.2" target="egit_external">Open</a>
+ </td>
+ </tr>
+ <tr>
+ <td>Open bugs</td>
+ <td>
+ <a href="https://bugs.eclipse.org/bugs/buglist.cgi?product=EGit&amp;bug_status=NEW&amp;bug_status=REOPENED&amp;bug_status=UNCONFIRMED&amp;bug_status=ASSIGNED&amp;bug_severity=blocker&amp;bug_severity=critical&amp;bug_severity=major&amp;bug_severity=normal&amp;bug_severity=minor&amp;bug_severity=trivial&amp;order=bug_severity" target="egit_external">Open</a>
+ </td>
+ <td>
+ <a href="https://bugs.eclipse.org/bugs/buglist.cgi?product=JGit&amp;bug_status=NEW&amp;bug_status=REOPENED&amp;bug_status=UNCONFIRMED&amp;bug_status=ASSIGNED&amp;bug_severity=blocker&amp;bug_severity=critical&amp;bug_severity=major&amp;bug_severity=normal&amp;bug_severity=minor&amp;bug_severity=trivial&amp;order=bug_severity" target="egit_external">Open</a>
+ </td>
+ </tr>
+ <tr>
+ <td>Open enhancements</td>
+ <td>
+ <a href="https://bugs.eclipse.org/bugs/buglist.cgi?product=EGit&amp;bug_status=NEW&amp;bug_status=REOPENED&amp;bug_status=UNCONFIRMED&amp;bug_status=ASSIGNED&amp;bug_severity=enhancement&amp;order=bug_severity" target="egit_external">Open</a>
+ </td>
+ <td>
+ <a href="https://bugs.eclipse.org/bugs/buglist.cgi?product=JGit&amp;bug_status=NEW&amp;bug_status=REOPENED&amp;bug_status=UNCONFIRMED&amp;bug_status=ASSIGNED&amp;bug_severity=enhancement&amp;order=bug_severity" target="egit_external">Open</a>
+ </td>
+ </tr>
+ <tr>
+ <td>Bugs with votes</td>
+ <td>
+ <a href="https://bugs.eclipse.org/bugs/buglist.cgi?f1=votes&amp;list_id=2849777&amp;columnlist=votes%2Cproduct%2Ccomponent%2Cassigned_to%2Cbug_status%2Cresolution%2Cshort_desc%2Cchangeddate&amp;o1=greaterthan&amp;resolution=---&amp;v1=1&amp;classification=Technology&amp;query_format=advanced&amp;product=EGit" target="egit_external">With Votes</a>
+ </td>
+ <td>
+ <a href="https://bugs.eclipse.org/bugs/buglist.cgi?f1=votes&amp;list_id=2849777&amp;columnlist=votes%2Cproduct%2Ccomponent%2Cassigned_to%2Cbug_status%2Cresolution%2Cshort_desc%2Cchangeddate&amp;o1=greaterthan&amp;resolution=---&amp;v1=1&amp;classification=Technology&amp;query_format=advanced&amp;product=JGit" target="egit_external">With Votes</a>
+ </td>
+ </tr>
+ <tr>
+ <td>Assigned bugs and enhancements </td>
+ <td>
+ <a href="https://bugs.eclipse.org/bugs/buglist.cgi?product=EGit&amp;bug_status=ASSIGNED&amp;order=bug_severity" target="egit_external">Assigned</a>
+ </td>
+ <td>
+ <a href="https://bugs.eclipse.org/bugs/buglist.cgi?product=JGit&amp;bug_status=ASSIGNED&amp;order=bug_severity" target="egit_external">Assigned</a>
+ </td>
+ </tr>
+ <tr>
+ <th>Reports</th>
+ <th>EGit and JGit</th>
+ </tr>
+ <tr>
+ <td>Open EGit and JGit bugs</td>
+ <td>
+ <a href="https://bugs.eclipse.org/bugs/report.cgi?y_axis_field=bug_status&amp;cumulate=1&amp;format=bar&amp;x_axis_field=product&amp;query_format=report-graph&amp;short_desc_type=allwordssubstr&amp;product=EGit&amp;product=JGit&amp;longdesc_type=allwordssubstr&amp;bug_file_loc_type=allwordssubstr&amp;status_whiteboard_type=allwordssubstr&amp;keywords_type=allwords&amp;bug_status=UNCONFIRMED&amp;bug_status=NEW&amp;bug_status=REOPENED&amp;bug_status=ASSIGNED&amp;bug_severity=blocker&amp;bug_severity=critical&amp;bug_severity=major&amp;bug_severity=normal&amp;bug_severity=minor&amp;bug_severity=trivial&amp;emailtype1=substring&amp;emailtype2=substring&amp;bug_id_type=anyexact&amp;chfieldto=Now&amp;action=wrap&amp;field0-0-0=noop&amp;type0-0-0=noop" target="egit_external">Open</a>
+ </td>
+ </tr>
+ <tr>
+ <td>Assigned EGit and JGit bugs</td>
+ <td>
+ <a href="https://bugs.eclipse.org/bugs/report.cgi?y_axis_field=bug_status&amp;cumulate=1&amp;format=bar&amp;x_axis_field=product&amp;query_format=report-graph&amp;short_desc_type=allwordssubstr&amp;product=EGit&amp;product=JGit&amp;longdesc_type=allwordssubstr&amp;bug_file_loc_type=allwordssubstr&amp;status_whiteboard_type=allwordssubstr&amp;keywords_type=allwords&amp;bug_status=ASSIGNED&amp;bug_severity=blocker&amp;bug_severity=critical&amp;bug_severity=major&amp;bug_severity=normal&amp;bug_severity=minor&amp;bug_severity=trivial&amp;emailtype1=substring&amp;emailtype2=substring&amp;bug_id_type=anyexact&amp;chfieldto=Now&amp;action=wrap&amp;field0-0-0=noop&amp;type0-0-0=noop" target="egit_external">Assigned</a>
+ </td>
+ </tr>
+ <tr>
+ <td>New bugs opened</td>
+ <td>
+ <a href="https://bugs.eclipse.org/bugs/report.cgi?x_axis_field=bug_status&amp;y_axis_field=product&amp;z_axis_field=&amp;query_format=report-table&amp;short_desc_type=allwordssubstr&amp;short_desc=&amp;classification=Technology&amp;product=EGit&amp;product=JGit&amp;longdesc_type=allwordssubstr&amp;longdesc=&amp;bug_file_loc_type=allwordssubstr&amp;bug_file_loc=&amp;status_whiteboard_type=allwordssubstr&amp;status_whiteboard=&amp;keywords_type=allwords&amp;keywords=&amp;bug_severity=blocker&amp;bug_severity=critical&amp;bug_severity=major&amp;bug_severity=normal&amp;bug_severity=minor&amp;bug_severity=trivial&amp;emailtype1=substring&amp;email1=&amp;emailtype2=substring&amp;email2=&amp;bug_id_type=anyexact&amp;bug_id=&amp;votes=&amp;chfieldfrom=-1d&amp;chfieldto=Now&amp;chfield=%5BBug+creation%5D&amp;chfieldvalue=&amp;format=table&amp;action=wrap&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=" target="egit_external">Last day</a>
+ </td>
+ <td>
+ <a href="https://bugs.eclipse.org/bugs/report.cgi?x_axis_field=bug_status&amp;y_axis_field=product&amp;z_axis_field=&amp;query_format=report-table&amp;short_desc_type=allwordssubstr&amp;short_desc=&amp;classification=Technology&amp;product=EGit&amp;product=JGit&amp;longdesc_type=allwordssubstr&amp;longdesc=&amp;bug_file_loc_type=allwordssubstr&amp;bug_file_loc=&amp;status_whiteboard_type=allwordssubstr&amp;status_whiteboard=&amp;keywords_type=allwords&amp;keywords=&amp;bug_severity=blocker&amp;bug_severity=critical&amp;bug_severity=major&amp;bug_severity=normal&amp;bug_severity=minor&amp;bug_severity=trivial&amp;emailtype1=substring&amp;email1=&amp;emailtype2=substring&amp;email2=&amp;bug_id_type=anyexact&amp;bug_id=&amp;votes=&amp;chfieldfrom=-1w&amp;chfieldto=Now&amp;chfield=%5BBug+creation%5D&amp;chfieldvalue=&amp;format=table&amp;action=wrap&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=" target="egit_external">Last week</a>
+ </td>
+ <td>
+ <a href="https://bugs.eclipse.org/bugs/report.cgi?x_axis_field=bug_status&amp;y_axis_field=product&amp;z_axis_field=&amp;query_format=report-table&amp;short_desc_type=allwordssubstr&amp;short_desc=&amp;classification=Technology&amp;product=EGit&amp;product=JGit&amp;longdesc_type=allwordssubstr&amp;longdesc=&amp;bug_file_loc_type=allwordssubstr&amp;bug_file_loc=&amp;status_whiteboard_type=allwordssubstr&amp;status_whiteboard=&amp;keywords_type=allwords&amp;keywords=&amp;bug_severity=blocker&amp;bug_severity=critical&amp;bug_severity=major&amp;bug_severity=normal&amp;bug_severity=minor&amp;bug_severity=trivial&amp;emailtype1=substring&amp;email1=&amp;emailtype2=substring&amp;email2=&amp;bug_id_type=anyexact&amp;bug_id=&amp;votes=&amp;chfieldfrom=-1m&amp;chfieldto=Now&amp;chfield=%5BBug+creation%5D&amp;chfieldvalue=&amp;format=table&amp;action=wrap&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=" target="egit_external">Last month</a>
+ </td>
+ <td>
+ <a href="https://bugs.eclipse.org/bugs/report.cgi?x_axis_field=bug_status&amp;y_axis_field=product&amp;z_axis_field=&amp;query_format=report-table&amp;short_desc_type=allwordssubstr&amp;short_desc=&amp;classification=Technology&amp;product=EGit&amp;product=JGit&amp;longdesc_type=allwordssubstr&amp;longdesc=&amp;bug_file_loc_type=allwordssubstr&amp;bug_file_loc=&amp;status_whiteboard_type=allwordssubstr&amp;status_whiteboard=&amp;keywords_type=allwords&amp;keywords=&amp;bug_severity=blocker&amp;bug_severity=critical&amp;bug_severity=major&amp;bug_severity=normal&amp;bug_severity=minor&amp;bug_severity=trivial&amp;emailtype1=substring&amp;email1=&amp;emailtype2=substring&amp;email2=&amp;bug_id_type=anyexact&amp;bug_id=&amp;votes=&amp;chfieldfrom=-1y&amp;chfieldto=Now&amp;chfield=%5BBug+creation%5D&amp;chfieldvalue=&amp;format=table&amp;action=wrap&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=" target="egit_external">Last year</a>
+ </td>
+ </tr>
+ <tr>
+ <td>Bugs closed</td>
+ <td>
+ <a href="https://bugs.eclipse.org/bugs/report.cgi?x_axis_field=bug_status&amp;y_axis_field=product&amp;z_axis_field=&amp;query_format=report-table&amp;short_desc_type=allwordssubstr&amp;short_desc=&amp;classification=Technology&amp;product=EGit&amp;product=JGit&amp;longdesc_type=allwordssubstr&amp;longdesc=&amp;bug_file_loc_type=allwordssubstr&amp;bug_file_loc=&amp;status_whiteboard_type=allwordssubstr&amp;status_whiteboard=&amp;keywords_type=allwords&amp;keywords=&amp;bug_status=RESOLVED&amp;bug_status=VERIFIED&amp;bug_status=CLOSED&amp;bug_severity=blocker&amp;bug_severity=critical&amp;bug_severity=major&amp;bug_severity=normal&amp;bug_severity=minor&amp;bug_severity=trivial&amp;emailtype1=substring&amp;email1=&amp;emailtype2=substring&amp;email2=&amp;bug_id_type=anyexact&amp;bug_id=&amp;votes=&amp;chfieldfrom=-1d&amp;chfieldto=Now&amp;chfield=bug_status&amp;chfieldvalue=&amp;format=table&amp;action=wrap&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=" target="egit_external">Last day</a>
+ </td>
+ <td>
+ <a href="https://bugs.eclipse.org/bugs/report.cgi?x_axis_field=bug_status&amp;y_axis_field=product&amp;z_axis_field=&amp;query_format=report-table&amp;short_desc_type=allwordssubstr&amp;short_desc=&amp;classification=Technology&amp;product=EGit&amp;product=JGit&amp;longdesc_type=allwordssubstr&amp;longdesc=&amp;bug_file_loc_type=allwordssubstr&amp;bug_file_loc=&amp;status_whiteboard_type=allwordssubstr&amp;status_whiteboard=&amp;keywords_type=allwords&amp;keywords=&amp;bug_status=RESOLVED&amp;bug_status=VERIFIED&amp;bug_status=CLOSED&amp;bug_severity=blocker&amp;bug_severity=critical&amp;bug_severity=major&amp;bug_severity=normal&amp;bug_severity=minor&amp;bug_severity=trivial&amp;emailtype1=substring&amp;email1=&amp;emailtype2=substring&amp;email2=&amp;bug_id_type=anyexact&amp;bug_id=&amp;votes=&amp;chfieldfrom=-1w&amp;chfieldto=Now&amp;chfield=bug_status&amp;chfieldvalue=&amp;format=table&amp;action=wrap&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=" target="egit_external">Last week</a>
+ </td>
+ <td>
+ <a href="https://bugs.eclipse.org/bugs/report.cgi?x_axis_field=bug_status&amp;y_axis_field=product&amp;z_axis_field=&amp;query_format=report-table&amp;short_desc_type=allwordssubstr&amp;short_desc=&amp;classification=Technology&amp;product=EGit&amp;product=JGit&amp;longdesc_type=allwordssubstr&amp;longdesc=&amp;bug_file_loc_type=allwordssubstr&amp;bug_file_loc=&amp;status_whiteboard_type=allwordssubstr&amp;status_whiteboard=&amp;keywords_type=allwords&amp;keywords=&amp;bug_status=RESOLVED&amp;bug_status=VERIFIED&amp;bug_status=CLOSED&amp;bug_severity=blocker&amp;bug_severity=critical&amp;bug_severity=major&amp;bug_severity=normal&amp;bug_severity=minor&amp;bug_severity=trivial&amp;emailtype1=substring&amp;email1=&amp;emailtype2=substring&amp;email2=&amp;bug_id_type=anyexact&amp;bug_id=&amp;votes=&amp;chfieldfrom=-1m&amp;chfieldto=Now&amp;chfield=bug_status&amp;chfieldvalue=&amp;format=table&amp;action=wrap&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=" target="egit_external">Last month</a>
+ </td>
+ <td>
+ <a href="https://bugs.eclipse.org/bugs/report.cgi?x_axis_field=bug_status&amp;y_axis_field=product&amp;z_axis_field=&amp;query_format=report-table&amp;short_desc_type=allwordssubstr&amp;short_desc=&amp;classification=Technology&amp;product=EGit&amp;product=JGit&amp;longdesc_type=allwordssubstr&amp;longdesc=&amp;bug_file_loc_type=allwordssubstr&amp;bug_file_loc=&amp;status_whiteboard_type=allwordssubstr&amp;status_whiteboard=&amp;keywords_type=allwords&amp;keywords=&amp;bug_status=RESOLVED&amp;bug_status=VERIFIED&amp;bug_status=CLOSED&amp;bug_severity=blocker&amp;bug_severity=critical&amp;bug_severity=major&amp;bug_severity=normal&amp;bug_severity=minor&amp;bug_severity=trivial&amp;emailtype1=substring&amp;email1=&amp;emailtype2=substring&amp;email2=&amp;bug_id_type=anyexact&amp;bug_id=&amp;votes=&amp;chfieldfrom=-1y&amp;chfieldto=Now&amp;chfield=bug_status&amp;chfieldvalue=&amp;format=table&amp;action=wrap&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=" target="egit_external">Last year</a>
+ </td>
+ </tr>
+ </table>
+ <p>
+ <br/>
+ </p>
+ <p>To get notified of bugs, go to your e-mail preferences and add &lt;product&gt;.&lt;component&gt;-inbox@eclipse.org to your watch list. For example to get notified of EGit UI bugs, add
+ <i>egit.ui-inbox@eclipse.org</i>.
+ </p>
+ <h2 id="Keywords">Keywords</h2>
+ <p>To simplify bug management we started to tag EGit bugs with additional pseudo keywords (not normal Bugzilla keywords). The tags are prepended to the bug's summary field. Since we use these tags for internal bug management reporters of a bug should not add any pseudo keywords when filing the bug. The owner of the component bucket is responsible to add the keywords.</p>
+ <p>Keywords are used to group bugs without assigning them to a developer. So with the introduction of the keywords it is easy to search for all bugs belonging to a specific sub component. For example to get an overview of all open refactoring issues search for new, assigned or reopened bugs containing the word
+ <a href="refactoring">refactoring</a> in the summary field.
+ </p>
+ <p>Be aware that not all bugs are tagged with keywords, only bugs that belong to a certain sub group may have a tag attached. The following lists some of the currently used tags.</p>
+ <table border="1" cellpadding="3" cellspacing="0">
+ <tr>
+ <th>Tag</th>
+ <th>Description</th>
+ <th>Link</th>
+ </tr>
+ <tr>
+ <td>
+ <a href="sync">sync</a>
+ </td>
+ <td>everything related to Synchronize / Synchronize View</td>
+ <td>
+ <a href="https://bugs.eclipse.org/bugs/buglist.cgi?short_desc=%5Bsync%5D;query_format=advanced;bug_status=UNCONFIRMED;bug_status=NEW;bug_status=ASSIGNED;bug_status=REOPENED;short_desc_type=allwordssubstr;product=EGit" target="egit_external">View bugs</a>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="repoView">repoView</a>
+ </td>
+ <td>everything related to the Git Repository View</td>
+ <td>
+ <a href="https://bugs.eclipse.org/bugs/buglist.cgi?short_desc=%5BrepoView%5D;query_format=advanced;bug_status=UNCONFIRMED;bug_status=NEW;bug_status=ASSIGNED;bug_status=REOPENED;short_desc_type=allwordssubstr;product=EGit" target="egit_external">View bugs</a>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="releng">releng</a>
+ </td>
+ <td>everything related to release engineering and build</td>
+ <td>
+ <a href="https://bugs.eclipse.org/bugs/buglist.cgi?short_desc=%5Breleng%5D;query_format=advanced;bug_status=UNCONFIRMED;bug_status=NEW;bug_status=ASSIGNED;bug_status=REOPENED;short_desc_type=allwordssubstr;product=EGit" target="egit_external">View bugs</a>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="historyView">historyView</a>
+ </td>
+ <td>everything related to the Git History View</td>
+ <td>
+ <a href="https://bugs.eclipse.org/bugs/buglist.cgi?short_desc=%5BhistoryView%5D;query_format=advanced;bug_status=UNCONFIRMED;bug_status=NEW;bug_status=ASSIGNED;bug_status=REOPENED;short_desc_type=allwordssubstr;product=EGit" target="egit_external">View bugs</a>
+ </td>
+ </tr>
+ </table>
+ <p>
+ <br/>
+ </p><hr/>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="Tests.html" title="Tests">
+ <img alt="Previous" border="0" src="../../images/prev.gif"/>
+ </a>
+ </td>
+ <td style="width: 60%" align="center">
+ <a href="Contributor-Guide.html" title="EGit Contributor Guide">
+ <img alt="EGit Contributor Guide" border="0" src="../../images/home.gif"/>
+ </a>
+ </td>
+ <td style="width: 20%" align="right">
+ <a href="Website.html" title="Website">
+ <img alt="Next" border="0" src="../../images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top">Tests</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Website</td>
+ </tr>
+ </table>
+ </body>
+</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html
new file mode 100644
index 000000000..c63a36cbb
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html
@@ -0,0 +1,219 @@
+<?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 Contributor Guide - Builds</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">Builds</th>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="Development-IDE-Configuration.html" title="Development IDE Configuration">
+ <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="Documentation.html" title="Documentation">
+ <img alt="Next" border="0" src="../../images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top">Development IDE Configuration</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Documentation</td>
+ </tr>
+ </table><hr/>
+ <h1 id="Builds">Builds</h1>
+ <p>The central EGit and JGit builds run on the
+ <a href="https://hudson.eclipse.org/egit/" target="egit_external">JGit/EGit Hudson instance</a>
+ </p>
+ <p>Prerequisites for the Maven build are</p>
+ <ul>
+ <li>
+ <a href="http://maven.apache.org/download.html" target="egit_external">at least Maven 3.0.0</a> (but currently not Maven 3.1.0)
+ </li>
+ <li>see
+ <a href="http://maven.apache.org/settings.html" target="egit_external">settings.xml reference</a> on how to do basic Maven configuration
+ </li>
+ <li>if you want to learn how Maven works start reading
+ <a href="http://maven.apache.org/guides/getting-started/index.html" target="egit_external">the Maven Getting Started Guide</a>
+ </li>
+ </ul>
+ <p>Hudson</p>
+ <ul>
+ <li>
+ <a href="https://hudson.eclipse.org/egit/master" target="egit_external">development build jobs</a>
+ </li>
+ <li>
+ <a href="https://hudson.eclipse.org/egit/stable" target="egit_external">maintenance and release build jobs</a>
+ </li>
+ </ul>
+ <h2 id="JGit_2">JGit</h2>
+ <ul>
+ <li>JGit can be built using Maven 2 or 3.</li>
+ <li>use Java 7 to run the JGit Maven build (required since bundle
+ <i>org.eclipse.jgit.java7</i> needs Java 7)
+ </li>
+ <li>JGit packaging projects (Eclipse feature and update site) are built using Maven 3 and Tycho.</li>
+ </ul>
+ <h2 id="EGit_2">EGit</h2>
+ <ul>
+ <li>EGit is built using Maven 3 and Tycho.</li>
+ </ul>
+ <h2 id="Mailing_Lists">Mailing Lists</h2>
+ <p>If you're interested in following builds, please check out the following mailing lists:</p>
+ <ul>
+ <li>
+ <a href="https://dev.eclipse.org/mailman/listinfo/jgit-build" target="egit_external">Subscribe to jgit-build@eclipse.org</a>
+ </li>
+ <li>
+ <a href="https://dev.eclipse.org/mailman/listinfo/egit-build" target="egit_external">Subscribe to egit-build@eclipse.org</a>
+ </li>
+ </ul>
+ <h2 id="Maven_Build_Sequence">Maven Build Sequence</h2>
+ <ul>
+ <li>Due to a
+ <a href="http://wiki.eclipse.org/Tycho/How_Tos/Dependency_on_pom-first_artifacts" target="egit_external">current limitation of Tycho</a> it is not possible to mix pom-first and manifest-first builds in the same reactor build hence the pom-first JGit build has to run separately before the build for the manifest-first JGit packaging project.
+ </li>
+ <li>The 3 builds must share the same local Maven repository otherwise dependencies between these builds cannot be resolved.</li>
+ <li>To run the build behind a firewall follow
+ <a href="http://maven.apache.org/guides/mini/guide-proxies.html" target="egit_external">http://maven.apache.org/guides/mini/guide-proxies.html</a>
+ </li>
+ </ul>
+ <p>Complete build sequence for a clean build (assuming $M2_HOME/bin is on the path and local Maven repository at ~/.m2/repository):</p>
+ <pre style="width: 55em;">[~/src/jgit] $ mvn clean install
+[INFO] Scanning for projects...
+...
+
+[~/src/jgit] $ mvn -f org.eclipse.jgit.packaging/pom.xml clean install
+[INFO] Scanning for projects...
+...
+
+[~/src/jgit] $ cd ../egit
+
+[~/src/egit] $ mvn clean install
+[INFO] Scanning for projects...
+...
+</pre>
+ <p>The EGit build uses the JGit p2 repository to resolve jgit dependencies. For local builds the build assumes
+ that egit and jgit source trees are located under a common parent folder. If this is not the case the path
+ to the jgit p2 repository has to be injected via system property:</p>
+ <pre><a href="~/src/egit">~/src/egit</a> $ mvn clean install -Djgit-site=file:/path/to/org.eclipse.jgit.updatesite/target/site
+</pre>
+ <p>The hudson build on build.eclipse.org uses (for SNAPSHOT builds):</p>
+ <pre><a href="~/src/egit">~/src/egit</a> $ mvn clean install -Djgit-site=<a href="https://repo.eclipse.org/content/unzip/snapshots.unzip/" target="egit_external">https://repo.eclipse.org/content/unzip/snapshots.unzip/</a>
+ org/eclipse/jgit/org.eclipse.jgit.repository/${JGIT_VERSION}/org.eclipse.jgit.repository-${JGIT_VERSION}.zip-unzip/
+</pre>
+ <p>If you wan to build EGit for the specific Juno platform, consider using the <code>platform-juno</code> maven profile:</p>
+ <pre><a href="~/src/egit">~/src/egit</a> $ mvn -P platform-juno clean install
+</pre>
+ <p>For EGit version 3.0, <code>platform-juno</code> (Eclipse 4.2) and <code>platform-kepler</code> (Eclipse 4.3) are available. In addition <code>platform-kepler-staging</code> refers to the Kepler staging repository.</p>
+ <p>Upon a successful build, a p2 update site should be generated inside
+ <i>egit/org.eclipse.egit.repository/target/repository</i>. If not, make sure the target platform has been downloaded from within Eclipse (Windows&gt;Preferences&gt;Plug-in Development&gt;Target Platform). The default target platform defined in the maven build is currently Eclipse 4.3.
+ </p>
+ <h2 id="FindBugs_and_PMD">FindBugs and PMD</h2>
+ <p>As part of the build, JGit and EGit run FindBugs and PMD to find issues.</p>
+ <ul>
+ <li>
+ <a href="https://hudson.eclipse.org/egit/job/jgit/findbugs" target="egit_external">JGit FindBugs Results</a>
+ </li>
+ <li>
+ <a href="https://hudson.eclipse.org/egit/job/jgit/dry" target="egit_external">JGit DRY (PMD) Results</a>
+ </li>
+ <li>
+ <a href="https://hudson.eclipse.org/egit/job/egit/findbugs" target="egit_external">EGit FindBugs Results</a>
+ </li>
+ <li>
+ <a href="https://hudson.eclipse.org/egit/job/egit/dry" target="egit_external">EGit DRY (PMD) Results</a>
+ </li>
+ </ul>
+ <h2 id="Checking_for_JGit_API_Changes_using_API_Baseline">Checking for JGit API Changes using API Baseline</h2>
+ <p>The JGit projects have API tooling enabled. In order to use PDE API tools to get assistance with maintaining API changes and additions you need to set an API baseline:</p>
+ <ul>
+ <li>download the p2 repository for the latest EGit release (which includes the JGit artifacts) to a local folder, e.g. <code>~/egit-releases/updates-3.0</code>, find the p2 repository URLs
+ <a href="http://wiki.eclipse.org/EGit/FAQ#Where_can_I_find_older_releases_of_EGit.3F" target="egit_external">here</a> and see
+ <a href="http://wiki.eclipse.org/Equinox_p2_Repository_Mirroring#Mirroring_Artifacts" target="egit_external">mirroring artifacts</a> for a way to download the repository
+ </li>
+ <li>in Eclipse click "Preferences &gt; Plug-In Development &gt; API Baselines", click "Add Baseline..." and define a new baseline (e.g. egit-3.0) and point it to the local copy of the corresponding EGit p2 repository.</li>
+ <li>the API tools will then raise warning/errors for all detected problems and provide quick fixes helping to resolve these problems</li>
+ <li>see the
+ <a href="http://wiki.eclipse.org/PDE/API_Tools/User_Guide" target="egit_external">PDE API Tools User Guide</a> for more details.
+ </li>
+ </ul>
+ <h2 id="Automated_Signing_and_Publishing">Automated Signing and Publishing</h2>
+ <p>EGit and JGit builds running on the
+ <a href="https://hudson.eclipse.org/egit/" target="egit_external">JGit/EGit Hudson</a> are automatically signed
+ (using the
+ <a href="http://wiki.eclipse.org/Common_Build_Infrastructure#Signing_tool" title="Common_Build_Infrastructure#Signing_tool" target="egit_external">CBI eclipse-jarsigner-plugin</a>) and published to the folder
+ </p>
+ <pre>
+master branch: /home/data/httpd/download.eclipse.org/egit/updates-nightly
+latest stable branch: /home/data/httpd/download.eclipse.org/egit/updates-stable-nightly
+</pre>
+ <ul>
+ <li>To enable signing the maven profile <code>eclipse-sign</code> must be enabled via the option <code>-P eclipse-sign</code> in the respective build jobs running at
+ <a href="https://hudson.eclipse.org/egit/" target="egit_external">https://hudson.eclipse.org/egit/</a>
+ </li>
+ <li>To enable publishing to
+ <i>download.eclipse.org</i> the maven profile <code>publish</code> must be enabled via the option <code>-P publish</code> in the egit build job.
+ </li>
+ </ul>
+ <h4 id="Signing_.28old_method.2C_replaced_by_automated_procedure.29">Signing (old method, replaced by automated procedure)</h4>
+ <p>To sign the EGit build, you need to have ssh access to build.eclipse.org and the ability to run
+ <b>/usr/bin/sign</b>
+ </p>
+ <p>At the moment, Chris Aniszczyk (caniszczyk) and Matthias Sohn (msohn) have signing privileges.</p>
+ <p>The first step is to ensure you're in a place you can sign on build.eclipse.org</p>
+ <pre>cd /home/data/httpd/download-staging.priv/commonBuild
+</pre>
+ <p>Next you run the signing command (Usage: /usr/bin/sign &lt;file&gt; &lt;mail|nomail&gt;
+ <a href="outputDir">outputDir</a>) on a zip of the EGit repo...
+ </p>
+ <pre>sign egit-p2-repo.zip my@email.com /home/data/users/caniszczyk/egit-0.8
+</pre>
+ <p>After that, you can publish the zip that is generated with the signing information.</p>
+ <h2 id="Contribution_to_Release_Train">Contribution to Release Train</h2>
+ <p>The release train contribution for JGit and EGit is maintained in the git repository </p>
+ <pre>ssh://git.eclipse.org/gitroot/simrel/org.eclipse.simrel.build.git
+</pre>
+ <p>in the file</p>
+ <pre>egit.b3aggrcon
+</pre>
+ <p>The release train build is coordinated on the
+ <a href="https://dev.eclipse.org/mailman/listinfo/cross-project-issues-dev" target="egit_external">cross-project-issues-dev mailing list</a>
+ </p>
+ <p>
+ <br/>
+ </p><hr/>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="Development-IDE-Configuration.html" title="Development IDE Configuration">
+ <img alt="Previous" border="0" src="../../images/prev.gif"/>
+ </a>
+ </td>
+ <td style="width: 60%" align="center">
+ <a href="Contributor-Guide.html" title="EGit Contributor Guide">
+ <img alt="EGit Contributor Guide" border="0" src="../../images/home.gif"/>
+ </a>
+ </td>
+ <td style="width: 20%" align="right">
+ <a href="Documentation.html" title="Documentation">
+ <img alt="Next" border="0" src="../../images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top">Development IDE Configuration</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Documentation</td>
+ </tr>
+ </table>
+ </body>
+</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Contributing-Patches.html b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Contributing-Patches.html
new file mode 100644
index 000000000..3760da57e
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Contributing-Patches.html
@@ -0,0 +1,414 @@
+<?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 Contributor Guide - Contributing Patches</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">Contributing Patches</th>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="Website.html" title="Website">
+ <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="Gerrit-Code-Review-Cheatsheet.html" title="Gerrit Code Review Cheatsheet">
+ <img alt="Next" border="0" src="../../images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top">Website</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Gerrit Code Review Cheatsheet</td>
+ </tr>
+ </table><hr/>
+ <h1 id="Contributing_Patches">Contributing Patches</h1>
+ <h2 id="Using_Gerrit_at_Eclipse">Using Gerrit at Eclipse</h2>
+ <p>EGit and JGit projects are using
+ <a href="http://code.google.com/p/gerrit/" target="egit_external">Gerrit Code Review</a> for Git based patch submission and review.
+ </p>
+ <p>Parts of this chapter are also available in the
+ <a href="http://wiki.eclipse.org/Gerrit#Doing_Code_Reviews_with_Gerrit" target="egit_external">Eclipse Gerrit wiki</a>.
+ </p>
+ <h3 id="User_Account">User Account</h3>
+ <ul>
+ <li>In order to contribute you need an
+ <a href="https://dev.eclipse.org/site_login/createaccount.php" target="egit_external">Eclipse user account</a> on eclipse.org, on creation of a new account you must agree to the Contributor Agreement.
+ </li>
+ </ul>
+ <h3 id="Legal_Paperwork">Legal Paperwork</h3>
+ <p>Before your first contribution can be accepted, you need to electronically sign the
+ <a href="http://www.eclipse.org/legal/CLA.php" target="egit_external">Eclipse Foundation Contributor License Agreement</a> (CLA). You only have to do this once, and it covers all Eclipse projects.
+ The new process was discussed in
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=381105" target="egit_external">bug 381105</a> and
+ <a href="http://dev.eclipse.org/mhonarc/lists/eclipse.org-committers/msg00933.html" target="egit_external">introduced on June 27, 2013</a>.
+ </p>
+ <p>Minimally, all Git commits you contribute must have the following:</p>
+ <ul>
+ <li>A single line summary in the comment field, followed by a more detailed descriptive paragraph;</li>
+ <li>Your credentials (email address) captured in the "Author" field; and</li>
+ <li>A "Signed-off-by" entry with matching credentials in the comment.</li>
+ <li>The "Signed-off-by" entry is required. By including this, you confirm that you are in compliance with the
+ <a href="http://www.eclipse.org/legal/CoO.php" target="egit_external">Certificate of Origin</a>.
+ </li>
+ </ul>
+ <p>In addition ensure</p>
+ <ul>
+ <li>that the contributed code is licensed under the project license (EPL for EGit and EDL for JGit). This is done by putting a
+ <a href="http://www.eclipse.org/legal/copyrightandlicensenotice.php" target="egit_external">copyright and license header</a> into every new java file. See other existing project source files for the correct content.
+ </li>
+ </ul>
+ <p>With a valid CLA on file, the signed-off commit and the copyright and license header in place, we will be able to accept small patches (&lt;1000 LoC) immediately. For larger patches, we will also have to create a contribution questionnaire for review by the Eclipse IP team, but this usually doesn't require additional actions from you.</p>
+ <p>To verify whether a contribution
+ <a href="https://dev.eclipse.org/mhonarc/lists/eclipse.org-committers/msg00973.html" target="egit_external">requires a CQ</a>, use one of the following git commands to check:
+ </p>
+ <ul>
+ <li>If it's committed: git log --shortstat</li>
+ <li>If not committed: git diff --stat</li>
+ </ul>
+ <p>These commands tell you the number of insertions(+), and deletions(-). If the total number of lines inserted (e.g. added) in a contribution is greater than 1000 (yes, this includes comments) then a CQ is required.</p>
+ <p>Find more details about how to contribute in
+ <a href="http://wiki.eclipse.org/Development_Resources/Contributing_via_Git" target="egit_external">Contributing via Git (for contributors)</a> and
+ <a href="http://wiki.eclipse.org/Development_Resources/Handling_Git_Contributions" target="egit_external">Handling Git Contributions (for committers)</a>.
+ </p>
+ <h3 id="Logon">Logon</h3>
+ <h4 id="Gerrit_Web_UI">Gerrit Web UI</h4>
+ <p>Logon to the Gerrit Web UI at <code>
+ <a href="https://git.eclipse.org/r/" target="egit_external">https://git.eclipse.org/r/</a></code> using the email address you registered with your Eclipse (and Bugzilla) account and your Eclipse password.
+ </p>
+ <h4 id="Git_over_SSH">Git over SSH</h4>
+ <p>When accessing Gerrit over SSH from git or EGit use the username displayed
+ <a href="https://git.eclipse.org/r/#/settings/" target="egit_external">here</a> and upload your public SSH key to Gerrit
+ <a href="https://git.eclipse.org/r/#/settings/ssh-keys" target="egit_external">here</a>.
+ </p>
+ <p>Gerrit SSH URl: <code>ssh://username@git.eclipse.org:29418/egit/egit.git</code></p>
+ <h4 id="Git_over_HTTPS">Git over HTTPS</h4>
+ <p>When accessing Gerrit over HTTPS from git or EGit use username and HTTP password displayed
+ <a href="https://git.eclipse.org/r/#/settings/http-password" target="egit_external">here</a>
+ </p>
+ <p>Gerrit HTTPS URl: <code>
+ <a href="https://git.eclipse.org/r/p/egit/egit.git" target="egit_external">https://git.eclipse.org/r/p/egit/egit.git</a></code>
+ </p>
+ <h3 id="SSH_Keys">SSH Keys</h3>
+ <ul>
+ <li>Add one or more public SSH keys to
+ <a href="https://git.eclipse.org/r/#/settings/ssh-keys" target="egit_external">Gerrit here</a>.
+ </li>
+ <li>If you are
+ <b>absolutely certain</b> you do not have keys already, you must create a public and private pair of SSH keys. It is strongly recommended that you
+ <a href="http://help.github.com/working-with-key-passphrases" target="egit_external">use a passphrase.</a>
+ </li>
+ <li>
+ <b>Generating SSH key pair on command line</b>
+ </li>
+ </ul>
+ <pre><pre style="width: 60em;">ssh-keygen -t rsa -C "your_email@youremail.com"</pre>
+</pre>
+ <ul>
+ <li>Execute SSH once to accept the host key (or copy it from the registration web page)</li>
+ </ul>
+ <pre style="width: 60em;">ssh -p 29418 username@git.eclipse.org
+</pre>
+ <p> </p>
+ <ul>
+ <li>
+ <a href="http://wiki.eclipse.org/EGit/User_Guide#Eclipse_SSH_Configuration" target="egit_external">Generating SSH key pair in Eclipse</a>
+ </li>
+ </ul>
+ <h3 id="Doing_Code_Reviews_with_Gerrit">Doing Code Reviews with Gerrit</h3>
+ <ul>
+ <li>Visit the
+ <a href="https://git.eclipse.org/r/" target="egit_external">Eclipse Gerrit Code Review instance</a> to start reviewing,
+ </li>
+ <li>
+ <a href="https://git.eclipse.org/r/#/settings/projects" target="egit_external">Register to watch projects</a> if you want to be notified by email on new or updated changes pushed for review
+ </li>
+ <li>Adjust your
+ <a href="https://git.eclipse.org/r/#/settings/preferences" target="egit_external">Gerrit preferences</a> to customize it to your needs
+ </li>
+ <li>See the
+ <a href="https://git.eclipse.org/r/Documentation/index.html#_user_guide" target="egit_external">Gerrit user guide</a> for more information about using Gerrit.
+ </li>
+ <li>The
+ <a href="http://wiki.eclipse.org/EGit/User_Guide#EGit_Tutorial_.28EclipseCon_Europe_Nov_2011.29" target="egit_external">EGit tutorial</a> walks you through the basic steps of working with Gerrit and EGit.
+ </li>
+ <li>Use
+ <a href="https://git.eclipse.org/r/Documentation/user-search.html" target="egit_external">Gerrit queries</a> to filter the review list for changes you are interested in:
+ <ul>
+ <li>
+ <a href="https://git.eclipse.org/r/#/q/status:open+project:egit/egit,n,z" target="egit_external">EGit changes pending in review</a>
+ </li>
+ <li>
+ <a href="https://git.eclipse.org/r/#/q/status:open+project:jgit/jgit,n,z" target="egit_external">JGit changes pending in review</a>
+ </li>
+ </ul>
+ </li>
+ </ul>
+ <h3 id="Using_Gerrit_with_git_command_line:">Using Gerrit with git command line:</h3>
+ <ul>
+ <li>Upload your patch from Git to the target project:</li>
+ </ul>
+ <p>
+ <b>JGit</b>
+ </p>
+ <pre style="width: 60em;">git push ssh://username@git.eclipse.org:29418/jgit/jgit.git HEAD:refs/for/master
+</pre>
+ <p>
+
+ <b>EGit</b>
+ </p>
+ <pre style="width: 60em;">git push ssh://username@git.eclipse.org:29418/egit/egit.git HEAD:refs/for/master
+</pre>
+ <p> </p>
+ <ul>
+ <li>Visit the
+ <a href="https://git.eclipse.org/r/" target="egit_external">Eclipse Gerrit Code Review server</a> to start reviewing
+ </li>
+ </ul>
+ <h4 id="Adding_a_dedicated_remote">Adding a dedicated remote</h4>
+ <p>Since git can have multiple remotes, you can define one to be used to refer to Gerrit to save typing. Inside a previously checked-out repository you can run: </p>
+ <pre>cd path/to/jgit
+git config remote.review.url ssh://username@git.eclipse.org:29418/jgit/jgit.git
+git config remote.review.push HEAD:refs/for/master
+
+cd path/to/egit
+git config remote.review.url ssh://username@git.eclipse.org:29418/egit/egit.git
+git config remote.review.push HEAD:refs/for/master
+</pre>
+ <p>
+ You can now submit review requests from either repository using: </p>
+ <pre>git push review
+</pre>
+ <h3 id="Using_Gerrit_with_EGit:">Using Gerrit with EGit:</h3>
+ <p>Eclipse will look for your private key in the SSH2 Home location specified in the General&gt;Network Connections&gt;SSH2 Preference Page. If your <code>id_rsa</code> private key makes use of the AES-128-CBC algorithm (view the file as text to confirm), Eclipse will need at least <code>com.jcraft.jsch 0.1.44</code> to make use of it.</p>
+ <ul>
+ <li>
+ <a href="../../EGit/User_Guide/Tasks.html#Cloning_Remote_Repositories" title="EGit/User_Guide#Cloning_Remote_Repositories">Clone the JGit and EGit repositories</a> and select
+ <b>Gerrit Configuration...</b> in the context menu of the remote "origin" in the Git Repositories view to
+ <a href="http://wiki.eclipse.org/EGit/User_Guide#Gerrit_Configuration" target="egit_external">configure pushing to the code review queue</a>.
+ </li>
+ <li>Alternative approach: Add a new review remote in the Git Repositories view and select
+ <b>Gerrit Configuration...</b> in the context menu of the remote
+ <ul>
+ <li>From the appropriate Remotes node, create a New Remote and choose to Configure for Push. A unique name should be chosen,
+ <i>review</i> is suggested.
+ </li>
+ <li>Changes committed to your local clone can now be pushed to Gerrit using the
+ <i>review</i> Remote. You will be prompted for your private key's passphrase if Eclipse is looking for it in the right place.
+ </li>
+ </ul>
+ </li>
+ <li>Instead of using the
+ <b>Gerrit Configuration...</b> wizard you can do the configuration steps manually:
+ <ul>
+ <li>Change the main URI or Add a Push URI (your Gerrit user name must be used here)
+ <ul>
+ <li><code>ssh://username@git.eclipse.org:29418/(project).git</code> </li>
+ </ul>
+ </li>
+ <li>In the Ref mapping section, add a RefSpec specification of <code>HEAD:refs/for/master</code></li>
+ </ul>
+ </li>
+ </ul>
+ <ul>
+ <li>Visit our
+ <a href="https://git.eclipse.org/r/" target="egit_external">Gerrit Code Review instance</a> to start reviewing
+ </li>
+ </ul>
+ <h3 id="Using_the_Mylyn_Gerrit_Connector">Using the Mylyn Gerrit Connector</h3>
+ <p>The Mylyn Gerrit Connector can be installed from the Mylyn p2 repository, e.g. for juno from
+ <a href="http://download.eclipse.org/mylyn/releases/juno" target="egit_external">http://download.eclipse.org/mylyn/releases/juno</a>.
+ </p>
+ <p>It contains several useful features:</p>
+ <ul>
+ <li>Cloning from Gerrit and automatic configuration
+ <ul>
+ <li>The wizards "Import Projects from Git" and "Clone Git Repository" will offer the possibility to browse the list of repositories on Gerrit servers and to clone selected repositories. After cloning the Gerrit configuration will be done automatically.</li>
+ </ul>
+ </li>
+ <li>Importing Gerrit changes as Mylyn tasks</li>
+ <li>Fetching patch sets directly from the task editor</li>
+ <li>Reviewing changes in the task editor</li>
+ <li>Submitting changes from the task editor</li>
+ </ul>
+ <h2 id="Granularity_of_Changes">Granularity of Changes</h2>
+ <ul>
+ <li>Make small commits, as small as reasonable. This makes them easy to review.</li>
+ <li>Each commit should have a commit message that explains very clearly what the commit sets out to achieve (unless this is abundantly clear from the code itself, which is basically only the case for trivial patches). Also, when you fix a bug then report which bug you fix. When there are deeper reasons for doing things the way the commit does, then explain these as well. This all is for the reviewers and yourself: the context of the commit is completely clear.</li>
+ <li>Do not mix concerns in commits: have a commit do a single thing. This makes them reviewable 'in isolation'. The purpose of the commit is clear and can be understood easily by the reviewers and yourself.</li>
+ <li>Do not break the build and tests for
+ <b>any commit</b>: this is very important for bug hunting.
+ </li>
+ <li>Split your work into multiple smaller pieces of work (when possible) and implement each of these pieces in a series of commits.</li>
+ <li>A series of commits should work towards a 'feature' in a clear way and only 'enable' the feature in the last commit of the series.</li>
+ <li>In a series of commits first lay the groundwork and then build on that towards the feature.</li>
+ </ul>
+ <h3 id="Branches">Branches</h3>
+ <p>When working with Gerrit, you can create local branches as you wish. When you are ready to push your changes, only the commits from your branch are pushed and are converted to reviews on Gerrit. The branch name itself is not visible on Gerrit.</p>
+ <p>Do not mix unrelated changes in branches: When you encounter a bug while working on something then create a new branch to fix the bug. Make sure you base it on the state of the remote branch that you want your fix to go to, e.g.
+ <i>origin/master</i>. If you have other changes that depend on the bug being fixed then rebase your work on that new branch.
+ </p>
+ <p>Merge/Rebase: If you want your branch to include new commits from the remote repository, rebase your local branch. The reason for this is that in Gerrit, changes are reviewed one commit at a time, and modified until all review feedback has been addressed. This is different from a pull request workflow, where the combined changes are reviewed and feedback is addressed with additional commits.</p>
+ <h2 id="Coding_standards">Coding standards</h2>
+ <p>Eclipse has standards for how to write code.</p>
+ <p>
+ <a href="http://wiki.eclipse.org/Coding_Conventions" title="Coding_Conventions" target="egit_external">Coding conventions</a>
+ </p>
+ <p>
+ <a href="http://wiki.eclipse.org/User_Interface_Guidelines" title="User_Interface_Guidelines" target="egit_external">Use interface guidelines</a>
+ </p>
+ <p>These documents have links to other document. Browse through them without expecting to learn everything, just so you know roughly what areas and types of details they covert. When you are
+ not sure about how to write a piece of code or design the user interface, these are the two
+ first places to look at.</p>
+ <p>In addition there is all the worlds collective knowledge on how to write programs that shine.
+ When there is a conflict, the Eclipse guide lines and conventions take precedence.</p>
+ <p>Breaking the rules is ok if there is a very good reason and you can tell us what that reason
+ is.</p>
+ <p>In addition to these general rules, we regard performance high. If the EGit plugin is slow
+ in any way, that is a bug and should be reported and fixed. Java isn't slow, but there is a
+ lot of slow Java code.</p>
+ <h3 id="Braces_for_one-line_statements">Braces for one-line statements</h3>
+ <p>Both in JGit and EGit, the preferred coding style is to leave off braces around statements with one line, e.g.:</p>
+ <pre>if (condition)
+ doSomething();
+</pre>
+ <p>Some exceptions to this rule:</p>
+ <ul>
+ <li>Don't leave off braces when the inner element is a try block</li>
+ <li>Don't leave off braces when the inner element is a long or deeply-nested if/else block</li>
+ </ul>
+ <h3 id="Removing_trailing_whitespace">Removing trailing whitespace</h3>
+ <p>In JGit and EGit we have enabled the save action "Remove trailing white spaces on all lines" for Java sources. This works except for empty comment lines, see
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=414421" target="egit_external">bug 414421</a>.
+ </p>
+ <p>As a workaround, use the following sequence of commands in the Java editor to trick the save action:</p>
+ <ul>
+ <li>remove the offending trailing whitespace</li>
+ <li>the save action re-adds the trailing whitespace</li>
+ <li>CTRL-Z (CMD-Z on Mac) removes the re-added whitespace without triggering the save action again</li>
+ </ul>
+ <p>Another workaround is to use
+ <a href="http://stackoverflow.com/questions/10413922/convert-spaces-to-tabs-in-lines-i-changed-in-a-commit?answertab=active#tab-top" target="egit_external">this little script</a> from the command line to edit away trailing whitespace from changed lines.
+ </p>
+ <h2 id="Commit_message_guidelines">Commit message guidelines</h2>
+ <ul>
+ <li>The commit message header should fit on one line and should start with an uppercase letter. A blank line separates it from the body of the message.</li>
+ <li>The first line should be a clear and concise description about the change and should not end with a dot. </li>
+ <li>Enter a newline before providing a more detailed description about the change.</li>
+ <li>Format the commit message to have newline characters after every 60-70 characters. </li>
+ <li>Find more reasoning about commit message formatting in
+ <a href="http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html" target="egit_external">"A Note About Git Commit Messages"</a>
+ </li>
+ <li>
+ <i>Commit message footers</i> (everything following the last blank line in the commit message) in
+ <i>Key: value</i> format are used for additional commit meta data. Some tools especially
+ <i>Gerrit</i> parse this meta data to provide additional functionality.
+ <ul>
+ <li>If there is an associated bug number in Bugzilla about it, it should come as a
+ <i>Bug:</i> footer right before Gerrit's Change-Id entry (if available) or towards the end.
+ </li>
+ <li>If a
+ <i>Contribution Questionnaire</i> has been issued to initiate and track the review of contributed changes by the Eclipse Foundation's IP team the IPZilla bug number should be added as
+ <i>CQ:</i> footer in the format shown below
+ </li>
+ <li>A
+ <i>Gerrit Change-Id</i> footer is required for all changes pushed to Gerrit (to enable pushing new patchsets for the same change), it should be added in the format shown below. Use the
+ <a href="Install_the_commit-msg_hook_in_your_repository" title="EGit/Contributor_Guide#Install_the_commit-msg_hook_in_your_repository">Gerrit commit message hook or EGit</a> to add the
+ <i>Change-Id</i>.
+ </li>
+ <li>A "Signed-off-by" can be added at the end of the commit message (see example below). Note: at the moment this is not required but may be used to list all who modified (amended, rebased, cherry-picked) this change.</li>
+ </ul>
+ </li>
+ </ul>
+ <pre>Fix the commit dialog to respect the workbench's selection
+
+Originally, the commit dialog would automatically check off all
+files in the dialog. This behaviour contradicts a user's expectation
+because their selection in the workbench is completely ignored. The
+code has been corrected to only preselect what the user has actually
+selected.
+
+Bug: 12345
+CQ: 6031
+Change-Id: I71ac4844ab9d2f848352eba9252090c586b4146a
+Signed-off-by: Your Name &lt;your.email@example.org&gt;
+</pre>
+ <h2 id="Copyright">Copyright</h2>
+ <p>When contributing patches, you have to update the copyright section at the beginning of the file if there is one. Please follow the style that is already present in the file. Some examples follow.</p>
+ <p>When there is only one copyright present (from a person or a company), like this:</p>
+ <pre>Copyright (C) 2010, 2011 Some Name &lt;some@example.org&gt;
+</pre>
+ <p>Change it like this (notice the updated year):</p>
+ <pre>Copyright (C) 2010, YEAR Some Name &lt;some@example.org&gt; and others.
+</pre>
+ <p>If there is a section <tt>Contributors:</tt> below the legal text and your change is more than a few lines, you can add your name there and optionally describe the change and link to a bug number. You can also start such a section if you contributed a significant change.</p>
+ <p>When there are multiple copyright entries there, add yours as a separate line. So, given this:</p>
+ <pre>Copyright (C) 2010 Some Name &lt;some@example.org&gt;
+Copyright (C) 2011 Other Name &lt;other@example.org&gt;
+</pre>
+ <p>Add another line:</p>
+ <pre>Copyright (C) 2010 Some Name &lt;some@example.org&gt;
+Copyright (C) 2011 Other Name &lt;other@example.org&gt;
+Copyright (C) YEAR Your Name &lt;you@example.org&gt;
+</pre>
+ <p>For new files, copy one of the existing headers and start the copyright section with your name.</p>
+ <p>Also see
+ <a href="http://www.eclipse.org/legal/copyrightandlicensenotice.php" target="egit_external">http://www.eclipse.org/legal/copyrightandlicensenotice.php</a> for more information.
+ </p>
+ <h2 id="Test_before_submitting">Test before submitting</h2>
+ <p>See the
+ <a href="#Manual_alpha_testing">Manual alpha testing</a> section for some advice about how to test you work yourself.
+ </p>
+ <ul>
+ <li>Run all existing tests. It does not take very long.</li>
+ <li>Pay attention to the Java and Eclipse SDK baselines. EGit requires only Java5 and Eclipse 3.5. You cannot use API's that are newer. We often see breakages because Java 6 API's are used.</li>
+ </ul>
+ <p>Note: In order to test in Eclipse 3.5 (Galileo), consider building EGit with the <code>platform-galileo</code> maven profile (see the
+ <a href="Builds.html#Maven_Build_Sequence">Maven Build Sequence</a> for more details).
+ </p>
+ <h2 id="Sending_patches_by_mail">Sending patches by mail</h2>
+ <p>Although sending patches by mail is the approved way of interacting with, and asking feedback from, the Git project, please don't send patches via
+ <a href="http://www.kernel.org/pub//software/scm/git/docs/git-send-email.html" target="egit_external">git send-email</a>. Instead, please use
+ <a href="http://www.kernel.org/pub/software/scm/git/docs/git-format-patch.html" target="egit_external">git format-patch</a> to generate the <code>mbox</code>, and then attach that to an item in bugzilla as per the above SUBMITTING_PATCHES guides.
+ </p>
+ <p>If you're sending a work-in-progress for a review, be aware that you can also attach work-in-progress (or RFC) items to Bugzilla; it's not just for finished patches. </p>
+ <p>
+ <b>However</b>, it's generally preferred that you send items which you want comments on via Gerrit as per
+ <a href="#Contributing_Patches">Contributing_Patches</a>, since Gerrit allows comments to be added in-line and allows the opportunity to send multiple versions of a patch after changes are made. Once a change has been submitted to Gerrit, you can then mail the developer mailing list with a request to review your change via URL or get Gerrit to send the mail on your behalf.
+ </p>
+ <p>
+ <br/>
+ </p><hr/>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="Website.html" title="Website">
+ <img alt="Previous" border="0" src="../../images/prev.gif"/>
+ </a>
+ </td>
+ <td style="width: 60%" align="center">
+ <a href="Contributor-Guide.html" title="EGit Contributor Guide">
+ <img alt="EGit Contributor Guide" border="0" src="../../images/home.gif"/>
+ </a>
+ </td>
+ <td style="width: 20%" align="right">
+ <a href="Gerrit-Code-Review-Cheatsheet.html" title="Gerrit Code Review Cheatsheet">
+ <img alt="Next" border="0" src="../../images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top">Website</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Gerrit Code Review Cheatsheet</td>
+ </tr>
+ </table>
+ </body>
+</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Contributor-Guide.html b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Contributor-Guide.html
new file mode 100644
index 000000000..b3316f1d1
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Contributor-Guide.html
@@ -0,0 +1,89 @@
+<?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 Contributor 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 Contributor 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="Obtaining-Sources.html" title="Obtaining Sources">
+ <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">Obtaining Sources</td>
+ </tr>
+ </table><hr/>
+ <h1 id="Communication">Communication</h1>
+ <table border="1" cellpadding="3" cellspacing="0">
+ <tr>
+ <th>Channel</th>
+ <th>JGit</th>
+ <th>EGit </th>
+ </tr>
+ <tr>
+ <td>Developer Mailing List</td>
+ <td>
+ <a href="https://dev.eclipse.org/mailman/listinfo/jgit-dev" target="egit_external">JGit developer mailing list</a>
+ </td>
+ <td>
+ <a href="https://dev.eclipse.org/mailman/listinfo/egit-dev" target="egit_external">EGit developer mailing list</a>
+ </td>
+ </tr>
+ <tr>
+ <td>Build Notices Mailing List</td>
+ <td>
+ <a href="https://dev.eclipse.org/mailman/listinfo/jgit-build" target="egit_external">JGit build notices mailing list</a>
+ </td>
+ <td>
+ <a href="https://dev.eclipse.org/mailman/listinfo/egit-build" target="egit_external">EGit build notices mailing list</a>
+ </td>
+ </tr>
+ <tr>
+ <td>Reporting Bugs</td>
+ <td>
+ <a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=JGit&amp;rep_platform=All&amp;op_sys=All" target="egit_external">File new JGit bug</a>
+ </td>
+ <td>
+ <a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=EGit&amp;rep_platform=All&amp;op_sys=All" target="egit_external">File new EGit bug</a>
+ </td>
+ </tr>
+ <tr>
+ <td>User Forum</td>
+ <td>
+ <a href="http://www.eclipse.org/forums/index.php?t=thread&amp;frm_id=48" target="egit_external">EGit User Forum</a>
+ </td>
+ </tr>
+ </table>
+ <p>
+ <br/>
+ </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="Obtaining-Sources.html" title="Obtaining Sources">
+ <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">Obtaining Sources</td>
+ </tr>
+ </table>
+ </body>
+</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Development-IDE-Configuration.html b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Development-IDE-Configuration.html
new file mode 100644
index 000000000..d9dec5ef3
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Development-IDE-Configuration.html
@@ -0,0 +1,152 @@
+<?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 Contributor Guide - Development IDE Configuration</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">Development IDE Configuration</th>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="Obtaining-Sources.html" title="Obtaining Sources">
+ <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="Builds.html" title="Builds">
+ <img alt="Next" border="0" src="../../images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top">Obtaining Sources</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Builds</td>
+ </tr>
+ </table><hr/>
+ <h1 id="Development_IDE_Configuration">Development IDE Configuration</h1>
+ <p>Download and install "Eclipse for RCP and RAP Developers" from here, if you don't already have it:</p>
+ <p>
+ <a href="http://www.eclipse.org/downloads/" target="egit_external">http://www.eclipse.org/downloads/</a>
+ </p>
+ <h2 id="Tools">Tools</h2>
+ <p>
+ <b>Note:</b> You have to use at least Eclipse 4.3.2 (Kepler SR2), earlier versions had a bug where the following did not work (see
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=409073" target="egit_external">bug 409073</a>).
+ </p>
+ <p>To install all the necessary tools to work on EGit/JGit, there is a
+ <a href="http://git.eclipse.org/c/egit/egit.git/plain/tools/egit-developer-tools.p2f" target="egit_external">egit-developer-tools.p2f</a> file which you can use as follows:
+ </p>
+ <ul>
+ <li>File &gt; Import &gt; Install &gt; Install Software Items from File</li>
+ <li>Browse...
+ <ul>
+ <li>Go to the location of your egit repository, open the
+ <i>tools</i> directory and select
+ <i>egit-developer-tools.p2f</i>
+ </li>
+ <li>Alternatively, if you only want to contribute to JGit, download the file from the above link and select it</li>
+ </ul>
+ </li>
+ <li>All the items you don't already have should be selected automatically</li>
+ <li>Finish the wizard</li>
+ <li>Restart</li>
+ </ul>
+ <h2 id="Java_Requirements">Java Requirements</h2>
+ <p>EGit and JGit have Java 5.0 and
+ <a href="https://wiki.eclipse.org/EGit/FAQ#What_versions_of_Eclipse_does_EGit_target.3F" target="egit_external">Eclipse Platform 3.8.2 (Juno)</a> as minimum requirements, so dependencies to newer Java and platform versions must be avoided.
+ </p>
+ <p>We are using
+ <i>PDE/API Tools Environment Descriptions</i> (see changes for
+ <a href="https://git.eclipse.org/r/#/c/4785/" target="egit_external">JGit</a> and
+ <a href="https://git.eclipse.org/r/#/c/4365/" target="egit_external">EGit</a>) to facilitate detecting code which isn't working on Java 5. If you followed the instructions in the
+ <i>Tools</i> section above, the necessary descriptions should already be installed. Otherwise install
+ <i>PDE/API Tools Environment Descriptions</i> from the release train repository, see
+ <a href="http://wiki.eclipse.org/Execution_Environments#Installing_Execution_Environment_Descriptions" title="Execution_Environments#Installing_Execution_Environment_Descriptions" target="egit_external">Installing Execution Environment Descriptions</a>.
+ </p>
+ <h2 id="Dependencies">Dependencies</h2>
+ <p>After importing the EGit and JGit projects in Eclipse, they will not compile due to missing dependencies. There are a few ways to install these.</p>
+ <h3 id="Option_1:_Use_a_Target_Platform">Option 1: Use a Target Platform</h3>
+ <p>
+ <img align="right" title="EGit target platforms in org.eclipse.egit.target" alt="EGit target platforms in org.eclipse.egit.target" border="0" src="images/EGit-Target-Platforms.png‎"/>
+ </p>
+ <p>This is the easiest method to install dependencies:</p>
+ <ul>
+ <li>Open the
+ <i>org.eclipse.egit.target</i> project
+ </li>
+ <li>Choose the
+ <i>egit-&lt;version&gt;.target</i> file matching the version of your Eclipse platform (e.g. 4.2 for Juno) and open it (this may take a while as it downloads the indexes of the p2 repositories the target platform refers to)
+ </li>
+ <li>In the resulting editor, click on the
+ <i>Set as Target Platform</i> link at the top right (this may also take a while)
+ </li>
+ </ul>
+ <p>After that, the workspace should build cleanly. If not, try Project &gt; Clean... &gt; All. If this also doesn't help open Preferences &gt; Plug-In Development &gt; Target Platform,
+ select the checked target platform and click "Reload..." this will flush PDE's bundle cache and re-download the artifacts listed in the target platform.</p>
+ <p>There are different target definitions, one for each version of Eclipse that EGit supports. The one you select will be the one that is started if you want to try out a feature or bug fix.</p>
+ <p>You can always switch between them to test on different Eclipse versions. E.g. when you are developing some major UI functionality, you should try it with the oldest supported Eclipse release to make sure it doesn't depend on API that is only available in later versions.</p>
+ <h3 id="Option_2:_Install_from_Orbit_P2_Repository">Option 2: Install from Orbit P2 Repository</h3>
+ <p>Install the dependencies from the Orbit p2 repository by importing the p2f file described
+ <a href="#Tools">above</a>.
+ </p>
+ <p>If you want to try another Orbit p2 repository version on the
+ <a href="http://download.eclipse.org/tools/orbit/downloads/" target="egit_external">Orbit Downloads</a> page, click on the newest recommended build (R-Build) and copy the update site link from "Orbit Build Repository" (it should end with <tt>/repository</tt>). Add this update site in Eclipse using "Install New Software..." and then find and select the following entries:
+ </p>
+ <ul>
+ <li>Java Mocking and Stubbing Framework</li>
+ <li>Args4j</li>
+ <li>Protocol Buffers</li>
+ <li>Apache Jakarta log4j Plug-in</li>
+ <li>Apache Commons Compress</li>
+ <li>XZ Data Compression</li>
+ <li>Hamcrest Library of Matchers</li>
+ <li>JavaEWAH</li>
+ </ul>
+ <h2 id="Running">Running</h2>
+ <p>Now that everything builds, the next step is to run an Eclipse instance with the EGit/JGit code of the workspace:</p>
+ <ul>
+ <li>Right click on the
+ <i>org.eclipse.egit.ui</i> project
+ </li>
+ <li>Debug As &gt; Eclipse Application</li>
+ </ul>
+ <p>This should create a new launch configuration and start a new nested Eclipse instance in debug mode. The created launch configuration can be edited, e.g. to change where the workspace of the nested Eclipse should be located.</p>
+ <p>The launch configuration can also be used in normal (non-debug) mode of course.</p>
+ <p>Also see the
+ <a href="http://help.eclipse.org/juno/topic/org.eclipse.pde.doc.user/guide/tools/launchers/eclipse_application_launcher.htm" target="egit_external">reference on eclipse application launchers</a>.
+ </p>
+ <p>
+ <br/>
+ </p><hr/>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="Obtaining-Sources.html" title="Obtaining Sources">
+ <img alt="Previous" border="0" src="../../images/prev.gif"/>
+ </a>
+ </td>
+ <td style="width: 60%" align="center">
+ <a href="Contributor-Guide.html" title="EGit Contributor Guide">
+ <img alt="EGit Contributor Guide" border="0" src="../../images/home.gif"/>
+ </a>
+ </td>
+ <td style="width: 20%" align="right">
+ <a href="Builds.html" title="Builds">
+ <img alt="Next" border="0" src="../../images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top">Obtaining Sources</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Builds</td>
+ </tr>
+ </table>
+ </body>
+</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Documentation.html b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Documentation.html
new file mode 100644
index 000000000..68adb9f49
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Documentation.html
@@ -0,0 +1,80 @@
+<?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 Contributor Guide - Documentation</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">Documentation</th>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="Builds.html" title="Builds">
+ <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="Tests.html" title="Tests">
+ <img alt="Next" border="0" src="../../images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top">Builds</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Tests</td>
+ </tr>
+ </table><hr/>
+ <h1 id="Documentation">Documentation</h1>
+ <p>The EGit project sources its documentation from the wiki and generates Eclipse help content from it (under the covers, we are using
+ <a href="http://wiki.eclipse.org/Mylyn/WikiText" target="egit_external">Mylyn WikiText</a> to make this possible). This significantly lowers the barrier for people to contribute documentation to the EGit project. To contribute documentation, simply modify the
+ <a href="http://wiki.eclipse.org/EGit/User_Guide" target="egit_external">EGit User's Guide</a>. Have a look at the
+ <a href="http://wiki.eclipse.org/DocumentationGuidelines/StyleGuidelines" title="DocumentationGuidelines/StyleGuidelines" target="egit_external">Style Guidelines</a> and
+ <a href="http://wiki.eclipse.org/Eclipse_Doc_Style_Guide" title="Eclipse_Doc_Style_Guide" target="egit_external">Eclipse Documentation Style Guide</a> to get some guidance on how to write good documentation. More on that can be found
+ <a href="http://wiki.eclipse.org/DocumentationGuidelines" title="DocumentationGuidelines" target="egit_external">here</a>.
+ </p>
+ <p>The documentation is contained in the
+ <b>org.eclipse.egit.doc</b> plug-in. The
+ <b>build-help.xml</b> drives the generation of the help content. It is integrated into the maven build. The regular maven build of
+ <b>org.eclipse.egit.doc</b>
+ </p>
+ <pre><b>$ mvn clean install</b>
+</pre>
+ <p>will only package the help content committed to the egit repository. To update the help content by downloading the latest documentation from the wiki run</p>
+ <pre><b>$ mvn clean install -Dupdate.egit.doc</b>
+</pre>
+ <p>Don't forget to check all the generated help pages and especially all hyperlinks and images before pushing the updated help to the code review system for inclusion into the continuous build.</p>
+ <p>The aim is to generate new documentation every month or so (or just on demand). If you're making big changes or want the documentation refreshed, please let us know on the egit-dev mailing list.</p>
+ <p>
+ <br/>
+ </p><hr/>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="Builds.html" title="Builds">
+ <img alt="Previous" border="0" src="../../images/prev.gif"/>
+ </a>
+ </td>
+ <td style="width: 60%" align="center">
+ <a href="Contributor-Guide.html" title="EGit Contributor Guide">
+ <img alt="EGit Contributor Guide" border="0" src="../../images/home.gif"/>
+ </a>
+ </td>
+ <td style="width: 20%" align="right">
+ <a href="Tests.html" title="Tests">
+ <img alt="Next" border="0" src="../../images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top">Builds</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Tests</td>
+ </tr>
+ </table>
+ </body>
+</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Gerrit-Code-Review-Cheatsheet.html b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Gerrit-Code-Review-Cheatsheet.html
new file mode 100644
index 000000000..72578abaa
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Gerrit-Code-Review-Cheatsheet.html
@@ -0,0 +1,182 @@
+<?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 Contributor Guide - Gerrit Code Review Cheatsheet</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">Gerrit Code Review Cheatsheet</th>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="Contributing-Patches.html" title="Contributing Patches">
+ <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">Contributing Patches</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="Gerrit_Code_Review_Cheatsheet">Gerrit Code Review Cheatsheet</h1>
+ <h2 id="Install_the_commit-msg_hook_in_your_repository">Install the commit-msg hook in your repository</h2>
+ <pre style="width: 60em;">scp -p -P 29418 username@git.eclipse.org:hooks/commit-msg .git/hooks/
+</pre>
+ <p>
+ This will ask for a password. It is the password that you have to generate in the
+ <i>SSH Keys</i> section of settings in your Gerrit account.
+ </p>
+ <p>You can alternatively
+ <a href="https://git.eclipse.org/r/tools/hooks/commit-msg" target="egit_external">download the file</a>. The
+ <a href="http://gerrit.googlecode.com/svn/documentation/2.1.2/cmd-hook-commit-msg.html" target="egit_external">hook</a> helps append a Change-Id to your commit message.
+ </p>
+ <p>EGit can also generate a Gerrit Change-Id into your commit message both
+ <a href="../../EGit/User_Guide/Tasks.html#Commit_Message" title="EGit/User_Guide#Commit_Message">manually</a> or in an
+ <a href="../../EGit/User_Guide/Tasks.html#Gerrit_Configuration" title="EGit/User_Guide#Gerrit_Configuration">automated</a> way.
+ </p>
+ <h2 id="To_create_a_new_change">To create a new change</h2>
+ <ul>
+ <li>JGit</li>
+ </ul>
+ <pre style="width: 60em;">git push ssh://username@git.eclipse.org:29418/jgit/jgit.git HEAD:refs/for/master
+</pre>
+ <p> </p>
+ <ul>
+ <li>EGit</li>
+ </ul>
+ <pre style="width: 60em;">git push ssh://username@git.eclipse.org:29418/egit/egit.git HEAD:refs/for/master
+</pre>
+ <p>
+ Or, if you've followed the instructions on
+ <a href="Contributing-Patches.html#Adding_a_dedicated_remote">Adding_a_dedicated_remote</a> you can simply do:
+ </p>
+ <pre style="width: 60em;">git push review
+</pre>
+ <p>
+ Since the current repository has the right definition for 'review', you won't need to remember the canonical push URL</p>
+ <h2 id="To_update_an_existing_change_with_a_new_commit">To update an existing change with a new commit</h2>
+ <pre style="width: 60em;">git push ssh://username@git.eclipse.org:29418/egit/egit.git HEAD:refs/for/master
+</pre>
+ <p>
+ This works because Gerrit links the new commit to the prior change based upon the Change-Id footer in the commit message. (This is automatically generated by the commit-msg hook you installed above.) If you refuse to use the commit-msg hook, or don't have a Change-Id footer, you should read the Gerrit documentation on
+ <a href="https://git.eclipse.org/r/Documentation/user-changeid.html" target="egit_external">change-id lines</a> and
+ <a href="https://git.eclipse.org/r/Documentation/user-upload.html#push_replace" target="egit_external">replacing changes</a>.
+ </p>
+ <p>
+ <b>Note:</b> To be picked up by Gerrit, a Change-Id line must be in the bottom portion (last paragraph) of a commit message, and may be mixed together with the Signed-off-by, Acked-by, or other such footers. So if your Change-Id line is ignored it's probably not in the last paragraph :).
+ </p>
+ <h2 id="To_compare_bulk_diffs_using_Git">To compare bulk diffs using Git</h2>
+ <p>Since each Gerrit review patchset actually commits its own tree, you can pull out the trees and compare them. </p>
+ <p>If you've got a large changeset, and you want to be able to do diffs between them via (command line) git instead of browsing on the web, then you can fetch the individual changes and then perform a diff. For example,
+ <a href="http://git.eclipse.org/r/2" target="egit_external">http://git.eclipse.org/r/2</a> shows the 'download' section for each patchset. In this case, it looks like:
+ </p>
+ <ul>
+ <li>Patch Set 1 <code>git pull ssh://username@git.eclipse.org/jgit refs/changes/02/2/1 (1d3331a91bd477d3f70cde9613576cf9688ac358)</code> </li>
+ <li>Patch Set 2 <code>git pull ssh://username@git.eclipse.org/jgit refs/changes/02/2/2 (13ab9a43d4d512963556a92e889b1204d32f8e68)</code> </li>
+ <li>Patch Set 3 <code>git pull ssh://username@git.eclipse.org/jgit refs/changes/02/2/3 (d14cc645655683ba3e30a35833fb2282142e898f)</code> </li>
+ <li>Patch Set 4 <code>git pull ssh://username@git.eclipse.org/jgit refs/changes/02/2/4 (43de8d385b614c72fd796e17da75d381f6e0cc25)</code></li>
+ </ul>
+ <p>Performing a <code>git pull</code> will both get the bits and merge them into your tree, which won't do what you want for comparison. So, in order to get the bits (but not merge), you need to do a <code>git fetch</code> instead. Let's say we want to diff the last two patches against each other rather than reviewing the entire patchset again: </p>
+ <pre>git fetch ssh://username@git.eclipse.org/jgit refs/changes/02/2/3
+git fetch ssh://username@git.eclipse.org/jgit refs/changes/02/2/4
+
+git diff d14cc645655683ba3e30a35833fb2282142e898f 43de8d385b614c72fd796e17da75d381f6e0cc25
+
+# or git diff d14cc6 43de8d
+</pre>
+ <p>
+ If you're doing this from within an already checked out project, you can do <code>git fetch origin</code> (or any other remote name in <code>.git/config}</code>. </p>
+ <p>Git fetched data will stay around in your repository, but will be 'orphaned' if no references point to it. To clean up, you can run <code>git gc</code> or wait until this happens automatically.</p>
+ <h2 id="To_trigger_Hudson_build_for_a_change">To trigger Hudson build for a change</h2>
+ <p>We have build jobs
+ <b>jgit.gerrit</b>,
+ <b>egit.gerrit</b> and
+ <b>egit-github.gerrit</b> on
+ <a href="https://hudson.eclipse.org/egit/" target="egit_external">https://hudson.eclipse.org/egit/</a> which are triggered automatically when a new change or a new patchset for an existing change is pushed for review. These jobs will comment on the respective change when the build is started and when it's finished and vote on the change according to the build and test results.
+ </p>
+ <p>Sometimes you may want to retrigger such a build e.g. because it may have failed due to some temporary problem.
+ Committers can manually trigger these jobs in the following way:</p>
+ <ul>
+ <li>Go to
+ <a href="https://hudson.eclipse.org/sandbox/gerrit_manual_trigger/" target="egit_external">Trigger a Gerrit event manually</a> page
+ </li>
+ <li>Search for a change you'd like to build</li>
+ <li>Select the patch set(s) you want to trigger</li>
+ <li>Press
+ <b>Trigger Selected</b> button
+ </li>
+ </ul>
+ <p>If you are not a committer and need to retrigger a build ask for that on the mailing list.</p>
+ <h2 id="To_approve_a_change">To approve a change</h2>
+ <ul>
+ <li>Click on Publish Comments </li>
+ <li>Vote with the radio buttons</li>
+ </ul>
+ <h2 id="To_add_a_reviewer">To add a reviewer</h2>
+ <p>Once you've pushed your commit to Gerrit for review, you can go to the web page (
+ <a href="https://git.eclipse.org/r/" target="egit_external">https://git.eclipse.org/r/</a>) and see your changes. By clicking on the review, there's an option to add a reviewer by e-mail address; they'll then be sent a message indicating that they'd like your review on the item.
+ </p>
+ <p>It's usually not necessary to add any reviewers, it should be reviewed by the committers sooner or later. If this hasn't happened, you can look for people that did changes in the same area and add them as reviewers. It's also ok to comment on a change to "bump" its visibility.</p>
+ <h2 id="Code_Review">Code Review</h2>
+ <p>The code review category indicates your opinion on the quality of the code, and how well it fits within the purpose of the existing surrounding code. A +2 vote from any committer is required before submission can occur. A -2 vote from any committer will block submission. </p>
+ <h2 id="IP_Review">IP Review</h2>
+ <p>The IP review category indicates whether or not the change has been properly logged under the
+ <a href="http://www.eclipse.org/legal/EclipseLegalProcessPoster.pdf" target="egit_external">Eclipse IP Process</a>. Under that process, any committer should mark his/her change +1 if they were the sole author of the change. For any other change, a committer should only mark +1 after ensuring the
+ <a href="Contributing-Patches.html#Legal_Paperwork">Legal Paperwork</a> has been done. A +1 vote is required to submit a change, while a -1 vote will block submission.
+ </p>
+ <h2 id="Submission_Guidelines">Submission Guidelines</h2>
+ <p>We strive to use Gerrit to improve our understanding of the code base and improve quality. </p>
+ <p>In order to ensure a proper review happens, some simple guidelines should be followed:</p>
+ <ul>
+ <li>vote 0/-1 for not-ready-to-submit (AKA WIP) own proposals, +1 otherwise;</li>
+ <li>If a changeset is not-ready-to-submit, please put
+ <a href="RFC">RFC</a> or
+ <a href="DRAFT">DRAFT</a> in the message to let people know
+ </li>
+ <li>let non-trivial changes be in review for at least 24 hours</li>
+ <li>if you want your changeset reviewed by someone, please add them as a reviewer</li>
+ </ul>
+ <h2 id="Tips_.26_Tricks">Tips &amp; Tricks</h2>
+ <h3 id="Class_Loading_Issues">Class Loading Issues</h3>
+ <p>If you encounter strange class loading issues during runtime (e.g. on UI test executions) the following might help:</p>
+ <p>Enable tracing in your launch configuration to get information how imported packages are resolved at runtime. Select the Tracing tab in your launch configuration, select "Enable tracing", select plug-in org.eclipse.osgi, select category resolver/wiring on the right side.</p>
+ <p>
+ <a href="http://wiki.eclipse.org/Category:Draft_Documentation" title="Category:Draft_Documentation" target="egit_external">Category:Draft_Documentation</a>
+ </p><hr/>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="Contributing-Patches.html" title="Contributing Patches">
+ <img alt="Previous" border="0" src="../../images/prev.gif"/>
+ </a>
+ </td>
+ <td style="width: 60%" align="center">
+ <a href="Contributor-Guide.html" title="EGit Contributor Guide">
+ <img alt="EGit Contributor 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">Contributing Patches</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Updating This Document</td>
+ </tr>
+ </table>
+ </body>
+</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Obtaining-Sources.html b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Obtaining-Sources.html
new file mode 100644
index 000000000..b3225b2cc
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Obtaining-Sources.html
@@ -0,0 +1,120 @@
+<?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 Contributor Guide - Obtaining Sources</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">Obtaining Sources</th>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="Contributor-Guide.html" title="EGit Contributor Guide">
+ <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="Development-IDE-Configuration.html" title="Development IDE Configuration">
+ <img alt="Next" border="0" src="../../images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top">EGit Contributor Guide</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Development IDE Configuration</td>
+ </tr>
+ </table><hr/>
+ <h1 id="Obtaining_Sources">Obtaining Sources</h1>
+ <p>EGit and JGit are self hosted in Git. You can browse the repositories on the web:
+
+ <a href="http://git.eclipse.org/c/egit/" target="egit_external">EGit</a>,
+ <a href="http://git.eclipse.org/c/jgit/" target="egit_external">JGit</a>
+ </p>
+ <p>The first section below describes how to clone a repository and can be skipped if you have done this before.</p>
+ <p>The next section lists the repositories and their URLs.</p>
+ <h2 id="Cloning">Cloning</h2>
+ <h3 id="On_the_command_line">On the command line</h3>
+ <pre style="width: 40em;">
+git clone &lt;enter URL&gt;
+</pre>
+ <p>After that, import the projects into Eclipse using Import &gt; Existing Projects into Workspace.</p>
+ <h3 id="Using_EGit_.28see_.5Bhttp:.2F.2Fwww.eclipse.org.2Fegit.2Fdownload.2F_download_page.5D.29">Using EGit (see
+ <a href="http://www.eclipse.org/egit/download/" target="egit_external">download page</a>)
+ </h3>
+ <p>First, verify that the default repository folder as set on the main Git preference page is to your liking.</p>
+ <p>Then, clone the repository and import the projects:</p>
+ <ul>
+ <li>Open
+ <i>File</i> &gt;
+ <i>Import...</i> and select
+ <i>Git</i> &gt;
+ <i>Projects from Git</i>
+ </li>
+ <li>Selet
+ <i>URI</i>
+ </li>
+ <li>Enter the URL (see next section) </li>
+ <li>Import existing projects into the workspace from the newly created working directory</li>
+ </ul>
+ <h2 id="Repositories">Repositories</h2>
+ <p>To develop EGit, the EGit and JGit repositories are needed, the others are optional. To develop JGit, only JGit is needed. </p>
+ <h3 id="EGit">EGit</h3>
+ <p>URL:
+ <a href="https://git.eclipse.org/r/egit/egit.git" target="egit_external">https://git.eclipse.org/r/egit/egit.git</a>
+ </p>
+ <p>This is the main repository, where the standard EGit feature is developed. It contains the code for the UI and Eclipse integration.</p>
+ <h3 id="JGit">JGit</h3>
+ <p>URL:
+ <a href="https://git.eclipse.org/r/jgit/jgit.git" target="egit_external">https://git.eclipse.org/r/jgit/jgit.git</a>
+ </p>
+ <p>This is the Java implementation of Git used by EGit, for working with Git repositories.</p>
+ <h3 id="EGit_GitHub_Integration">EGit GitHub Integration</h3>
+ <p>URL:
+ <a href="https://git.eclipse.org/r/p/egit/egit-github.git" target="egit_external">https://git.eclipse.org/r/p/egit/egit-github.git</a>
+ </p>
+ <p>EGit also provides tools for integrating with GitHub and Mylyn tasks.</p>
+ <p>For getting the dependencies, open the file <code>org.eclipse.mylyn.github-feature/github.target</code> (
+ <a href="http://git.eclipse.org/c/egit/egit-github.git/plain/org.eclipse.mylyn.github-feature/github.target" target="egit_external">view on web</a>) and select
+ <i>Set as Target Platfrom</i>.
+ </p>
+ <h3 id="EGit_PDE_Tools">EGit PDE Tools</h3>
+ <p>URL:
+ <a href="https://git.eclipse.org/r/egit/egit-pde.git" target="egit_external">https://git.eclipse.org/r/egit/egit-pde.git</a>
+ </p>
+ <p>EGit also provides tools for integrating with
+ <a href="http://wiki.eclipse.org/PDE/Build" title="PDE/Build" target="egit_external">PDE Build</a> and Eclipse RelEng Tools. If you are an Eclipse developer using PDE Build and/or the Eclipse RelEng tools you might be interesting in the following as well. Otherwise you might just skip this section.
+ </p>
+ <p>In addition to the
+ <a href="Development-IDE-Configuration.html#Dependencies">dependencies</a> required for JGit and EGit you also need Eclipse PDE (&gt;= 3.6.1) as well as <code>org.eclipse.releng.tools</code> in your target platform or checked out from CVS in your workspaces.
+ </p><hr/>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="Contributor-Guide.html" title="EGit Contributor Guide">
+ <img alt="Previous" border="0" src="../../images/prev.gif"/>
+ </a>
+ </td>
+ <td style="width: 60%" align="center">
+ <a href="Contributor-Guide.html" title="EGit Contributor Guide">
+ <img alt="EGit Contributor Guide" border="0" src="../../images/home.gif"/>
+ </a>
+ </td>
+ <td style="width: 20%" align="right">
+ <a href="Development-IDE-Configuration.html" title="Development IDE Configuration">
+ <img alt="Next" border="0" src="../../images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top">EGit Contributor Guide</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Development IDE Configuration</td>
+ </tr>
+ </table>
+ </body>
+</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Tests.html b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Tests.html
new file mode 100644
index 000000000..3ff25984b
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Tests.html
@@ -0,0 +1,112 @@
+<?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 Contributor Guide - Tests</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">Tests</th>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="Documentation.html" title="Documentation">
+ <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="Bugs.html" title="Bugs">
+ <img alt="Next" border="0" src="../../images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top">Documentation</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Bugs</td>
+ </tr>
+ </table><hr/>
+ <h1 id="Tests">Tests</h1>
+ <h2 id="JGit_Unit_Tests">JGit Unit Tests</h2>
+ <p>The JGit unit tests are executed during the maven build.
+ To run them from the Eclipse workbench use the launch configurations which are part of the sources of the test bundles'.</p>
+ <h2 id="JGit_HTTP_Tests">JGit HTTP Tests</h2>
+ <p>The JGit HTTP tests in
+ <i>org.eclipse.jgit.http.test</i> rely on the Jetty web container.
+ </p>
+ <p>To run these tests from Eclipse the Jetty feature is needed. Use one of the target platforms as described in
+ <a href="Development-IDE-Configuration.html#Dependencies">dependencies</a>.
+ </p>
+ <p>Alternatively, install "Jetty 7.6.11.v20130520" from
+ <a href="http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/7.6.11.v20130520/" target="egit_external">http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/7.6.11.v20130520/</a> .
+ </p>
+ <h2 id="EGit_Core_Tests">EGit Core Tests</h2>
+ <p>The EGit Core tests are executed during the maven build for the bundle
+ <i>org.eclipse.egit.core.test</i>.
+ </p>
+ <p>To run them from the Eclipse workbench use the launch configuration which is part of the sources of the test bundle
+ <i>org.eclipse.egit.core.test</i>.
+ </p>
+ <h2 id="EGit_UI_Tests">EGit UI Tests</h2>
+ <p>The EGit UI tests are using SWTBot, using the 'SWTBot for Eclipse Testing' feature.</p>
+ <p>You need to install at least "SWTBot for Eclipse Testing" and "SWTBot IDE Feature":</p>
+ <ul>
+ <li>Juno and Kepler:
+ <a href="http://download.eclipse.org/technology/swtbot/releases/2.1.0/" target="egit_external">http://download.eclipse.org/technology/swtbot/releases/2.1.0/</a>
+ </li>
+ </ul>
+ <p>Starting a UI test from Eclipse:</p>
+ <ul>
+ <li>select the test class or test method</li>
+ <li>click
+ <b>Run As &gt; SWTBot Test</b>
+ </li>
+ </ul>
+ <p>
+ <img border="0" src="images/Start-swtbot-test.png"/>
+ </p>
+ <p>Do not touch the mouse or keyboard when the UI test is running since this may
+ disturb the UI test by e.g. moving the current focus to another window.</p>
+ <h3 id="During_Maven_Build">During Maven Build</h3>
+ <p>The tests are executed in the integration-test phase of the
+ <a href="http://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html" target="egit_external">default Maven lifecycle</a>.
+ </p>
+ <p>If you want to skip execution of UI tests (only execute core tests):</p>
+ <pre>mvn -P skip-ui-tests clean install
+</pre>
+ <p>If you want to skip all tests:</p>
+ <pre>mvn clean install -Dmaven.test.skip=true
+</pre>
+ <h2 id="Auxilary_testing_tools">Auxilary testing tools</h2>
+ <p>Any code, including testing code, does not always do what you expected it to. The most common failure is probably the failure to actually execute the part of the code you wanted to test. Code coverage tools like
+ <a href="http://www.eclemma.org/" target="egit_external">EclEmma</a> can easily visualize what part of the code is being executed.
+ </p><hr/>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="Documentation.html" title="Documentation">
+ <img alt="Previous" border="0" src="../../images/prev.gif"/>
+ </a>
+ </td>
+ <td style="width: 60%" align="center">
+ <a href="Contributor-Guide.html" title="EGit Contributor Guide">
+ <img alt="EGit Contributor Guide" border="0" src="../../images/home.gif"/>
+ </a>
+ </td>
+ <td style="width: 20%" align="right">
+ <a href="Bugs.html" title="Bugs">
+ <img alt="Next" border="0" src="../../images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top">Documentation</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Bugs</td>
+ </tr>
+ </table>
+ </body>
+</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Updating-This-Document.html b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Updating-This-Document.html
new file mode 100644
index 000000000..bd2e004dc
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Updating-This-Document.html
@@ -0,0 +1,55 @@
+<?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 Contributor 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="Gerrit-Code-Review-Cheatsheet.html" title="Gerrit Code Review Cheatsheet">
+ <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">Gerrit Code Review Cheatsheet</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/Contributor_Guide" target="egit_external">http://wiki.eclipse.org/EGit/Contributor_Guide</a>
+ </p><hr/>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="Gerrit-Code-Review-Cheatsheet.html" title="Gerrit Code Review Cheatsheet">
+ <img alt="Previous" border="0" src="../../images/prev.gif"/>
+ </a>
+ </td>
+ <td style="width: 60%" align="center">
+ <a href="Contributor-Guide.html" title="EGit Contributor Guide">
+ <img alt="EGit Contributor 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">Gerrit Code Review Cheatsheet</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top"></td>
+ </tr>
+ </table>
+ </body>
+</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Website.html b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Website.html
new file mode 100644
index 000000000..5e08f9352
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Website.html
@@ -0,0 +1,100 @@
+<?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 Contributor Guide - Website</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">Website</th>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="Bugs.html" title="Bugs">
+ <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="Contributing-Patches.html" title="Contributing Patches">
+ <img alt="Next" border="0" src="../../images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top">Bugs</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Contributing Patches</td>
+ </tr>
+ </table><hr/>
+ <h1 id="Website">Website</h1>
+ <p>The EGit and JGit websites are located in Git repositories which are configured for Gerrit code review.</p>
+ <p>
+ <b>egit</b>
+ </p>
+ <ul>
+ <li>File &gt; Import &gt; Git &gt; Projects from Git</li>
+ <li>Select URL
+ <ul>
+ <li>HTTPS protocol:
+ <b>
+ <a href="https://git.eclipse.org/r/p/www.eclipse.org/egit.git" target="egit_external">https://git.eclipse.org/r/p/www.eclipse.org/egit.git</a>
+ </b>
+ </li>
+ <li>SSH protocol:
+ <b>ssh://user@git.eclipse.org:29418/www.eclipse.org/egit.git</b>
+ </li>
+ </ul>
+ </li>
+ <li>in Repositories View on node "origin" click "Gerrit Configuration..." and select branch "master", then changes you push to upstream will end up in Gerrit for review and can be submitted there</li>
+ </ul>
+ <p>
+ <b>jgit</b>
+ </p>
+ <ul>
+ <li>File &gt; Import &gt; Git &gt; Projects from Git</li>
+ <li>Select URL
+ <ul>
+ <li>HTTP protocol:
+ <b>
+ <a href="https://git.eclipse.org/r/p/www.eclipse.org/jgit.git" target="egit_external">https://git.eclipse.org/r/p/www.eclipse.org/jgit.git</a>
+ </b>
+ </li>
+ <li>SSH protocol:
+ <b>ssh://user@git.eclipse.org:29418/www.eclipse.org/jgit.git</b>
+ </li>
+ </ul>
+ </li>
+ <li>in Repositories View on node "origin" click "Gerrit Configuration..." and select branch "master", then changes you push to upstream will end up in Gerrit for review and can be submitted there</li>
+ </ul>
+ <p>
+ <br/>
+ </p><hr/>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="Bugs.html" title="Bugs">
+ <img alt="Previous" border="0" src="../../images/prev.gif"/>
+ </a>
+ </td>
+ <td style="width: 60%" align="center">
+ <a href="Contributor-Guide.html" title="EGit Contributor Guide">
+ <img alt="EGit Contributor Guide" border="0" src="../../images/home.gif"/>
+ </a>
+ </td>
+ <td style="width: 20%" align="right">
+ <a href="Contributing-Patches.html" title="Contributing Patches">
+ <img alt="Next" border="0" src="../../images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top">Bugs</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Contributing Patches</td>
+ </tr>
+ </table>
+ </body>
+</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/images/EGit-Target-Platforms.png b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/images/EGit-Target-Platforms.png
new file mode 100644
index 000000000..d619e6915
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/images/EGit-Target-Platforms.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/images/Start-swtbot-test.png b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/images/Start-swtbot-test.png
new file mode 100644
index 000000000..0309b2de8
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/images/Start-swtbot-test.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html b/org.eclipse.egit.doc/help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html
index 293219efc..65cde4fda 100644
--- a/org.eclipse.egit.doc/help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html
+++ b/org.eclipse.egit.doc/help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html
@@ -40,13 +40,13 @@
</p>
<p>Two problems surface with a centralised version control system, although they aren't immediately obvious: </p>
<ul>
- <li>You need to be 'online' to perform actions, like diff or patch.<span id="ref-1"><small>&nbsp;</small><sup>
- <a href="#reference-1">&amp;#91;1&amp;#93;</a></sup></span>
+ <li>You need to be 'online' to perform actions, like diff or patch
+ <a href="#reference-1">[1</a>].
</li>
<li>Patches generated against a particular branch can become outdated fairly quickly as development of the snapshot-in-time branch moves on (e.g. when it is time to apply the patch, HEAD is different than it was when the patch was generated).</li>
</ul>
- <p><span id="reference-1"><sup>
- <a href="#ref-1">&amp;#91;1&amp;#93;</a></sup></span>
+ <p>
+ <a href="#ref-1">[1</a>]
<i>(A note on SVN: since SVN keeps the last-known checkout, it's possible to do a limited set of operations while disconnected from SVN, like diff from the last-known checkout. However, in general, you are prevented from doing many of the operations that are possible while connected.)</i>
</p>
<p>The first problem is rarely apparent for those working with Eclipse in a location at (or near) the repository itself. Those in the same continent will rarely experience delays due to global network variation; in addition, they tend to be employed in an organisation and sit at a desktop connected to wired networking for most of the day. Road warriors (those with laptops and who code from the local coffee shop) tend to operate in a more frequently disconnected mode, which limits repository functionality to when they are connected.</p>
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.4/3.4.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.4/3.4.html
deleted file mode 100644
index ad1094479..000000000
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.4/3.4.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<?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 3.4 New and Noteworthy</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 3.4 New and Noteworthy</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="Bug-Fixes.html" title="Bug Fixes">
- <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">Bug Fixes</td>
- </tr>
- </table><hr/>
- <h1 id="EGit">EGit</h1>
- <h2 id="Features">Features</h2>
- <ul>
- <li>Add ability to edit a commit directly from the history view.</li>
- <li>Add ability to reword a commit directly from the history view.</li>
- <li>Enable creating a new git repository in a non-empty folder</li>
- <li>Honor "branch.&lt;name&gt;.mergeoptions" to set merge defaults</li>
- <li>Add a flag in the create stash dialog to allow including untracked changes in a stash</li>
- <li>Enable staging view for submodule repositories</li>
- <li>Add compare mode to CompareTreeView</li>
- <li>Provide extensibility for suggesting branch names</li>
- </ul>
- <h2 id="Usability_Improvements">Usability Improvements</h2>
- <ul>
- <li>Fix Package Explorer text colors on dark theme</li>
- <li>Provide an option to fetch from Gerrit without checking out the branch</li>
- <li>Action buttons in interactive rebase view toggle</li>
- <li>Double click on commit in interactive rebase view opens commit viewer</li>
- <li>Allow to move multiple commits simultaneously in interactive rebase view</li>
- <li>Provide "Show in History" in toolbar of commit viewer</li>
- <li>Show first line of commit message in editor tooltip of commit viewer</li>
- <li>Store the commit message edited in staging view on Eclipse shutdown</li>
- <li>Allow to disable logical model from preferences</li>
- <li>Use more space-efficient labels on commits with multiple tags in history view</li>
- <li>Warn when switching branches and a launch is running for the repo</li>
- <li>Offer to reset to a reflog entry via the context menu in reflog view</li>
- <li>Enable "Push to Upstream" when default remote has push spec</li>
- <li>Pre-fill branch name of upstream config if available in "Push Branch" dialog</li>
- <li>Add "Open workspace version" to context menu of the compare editor</li>
- <li>Check for uncommitted changes before pull with rebase strategy</li>
- <li>Check for uncommitted changes before rewording commits.</li>
- <li>Check for uncommitted changes before squashing commits.</li>
- <li>Don't ask for merge mode per default when opening merge tool</li>
- <li>Allow canceling the commit operation after save-during-commit</li>
- <li>Sort refs in the 'Switch To' menu in natural order</li>
- </ul>
- <h2 id="Performance_Improvements">Performance Improvements</h2>
- <ul>
- <li>Only fetch when synchronizing with remote-tracking branch</li>
- <li>Only sample the progress when computing the compare tree view</li>
- <li>Accelerate calculation of content of CompareTreeView.</li>
- </ul>
- <h2 id="Build_and_Release_Engineering">Build and Release Engineering</h2>
- <ul>
- <li>Update Luna target platform to Orbit release R20140525021250</li>
- <li>Update build to use Tycho 0.20.0</li>
- <li>Add script to create EGit release</li>
- </ul><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="Bug-Fixes.html" title="Bug Fixes">
- <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">Bug Fixes</td>
- </tr>
- </table>
- </body>
-</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/3.5.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/3.5.html
new file mode 100644
index 000000000..65fb5ce8b
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/3.5.html
@@ -0,0 +1,178 @@
+<?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 3.5 New and Noteworthy</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 3.5 New and Noteworthy</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="Bug-Fixes.html" title="Bug Fixes">
+ <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">Bug Fixes</td>
+ </tr>
+ </table><hr/>
+ <h1 id="EGit">EGit</h1>
+ <h2 id="Features">Features</h2>
+ <h3 id="Interactive_Rebase_View">Interactive Rebase View</h3>
+ <ul>
+ <li>Allow to move multiple commits by drag &amp; drop</li>
+ <li>Indicate order of steps and allow to change it by clicking on header</li>
+ </ul>
+ <p>
+ <img border="0" src="images/Egit-3.5-interactive-rebase.png"/>
+ </p>
+ <ul>
+ <li>Add context menu for plan modification</li>
+ </ul>
+ <p>
+ <img border="0" src="images/Egit-3.5-interactive-rebase-plan-menu.png"/>
+ </p>
+ <h3 id="History_View">History View</h3>
+ <ul>
+ <li>Add support for cherry-picking multiple commits at once</li>
+ </ul>
+ <p>
+ <img border="0" src="images/Egit-3.5-multi-cherry-pick.png"/>
+ </p>
+ <ul>
+ <li>Add support for reverting multiple commits at once.</li>
+ <li>Add menu action for deleting tags</li>
+ </ul>
+ <p>
+ <img border="0" src="images/Egit-3.5-history-delete-tag.png"/>
+ </p>
+ <ul>
+ <li>Use separate diff viewer instead of embedding into message</li>
+ <li>&#xa0;Support searching for branches/tags with find toolbar</li>
+ </ul>
+ <p>
+ <img border="0" src="images/Egit-3.5-history-find-tag-branch.png"/>
+ </p>
+ <ul>
+ <li>Make compare/open actions work with renamed/moved files</li>
+ <li>Enable "Create Patch" for first commit in the History view</li>
+ </ul>
+ <h3 id="Rebase">Rebase</h3>
+ <ul>
+ <li>Offer interactive and preserve merges options when selecting rebase target</li>
+ </ul>
+ <p>
+ <img border="0" src="images/Egit-3.5-rebase-options.png"/>
+ </p>
+ <h3 id="Stash_Support">Stash Support</h3>
+ <ul>
+ <li>Add "Stashes" menu to Team context menu and toolbar</li>
+ </ul>
+ <p>
+ <img border="0" src="images/EGit-3.5-stash-toolbar.png"/>
+ </p>
+ <ul>
+ <li>Add stash commit viewer</li>
+ </ul>
+ <p>
+ <img border="0" src="images/EGit-3.5-stash-viewer.png"/>
+ </p>
+ <ul>
+ <li>Optimize layouts of commit and stash viewer</li>
+ </ul>
+ <h3 id="Menus">Menus</h3>
+ <ul>
+ <li>Add "Team" menu on working sets</li>
+ </ul>
+ <p>
+ <img border="0" src="images/EGit-3.5-working-set-team-menu.png"/>
+ </p>
+ <ul>
+ <li>Add "Repository" submenu in Team menu of files and folders</li>
+ </ul>
+ <p>
+ <img border="0" src="images/EGit-3.5-repository-submenu.png"/>
+ </p>
+ <h3 id="GitHub_Connector">GitHub Connector</h3>
+ <ul>
+ <li>PullRequest supports the review_comments field</li>
+ </ul>
+ <h2 id="Usability_Improvements">Usability Improvements</h2>
+ <ul>
+ <li>Add "Show Annotations" to ruler menu of revision editor</li>
+ </ul>
+ <p>
+ <img border="0" src="images/Egit-3.5-annotations-in-ruler.png"/>
+ </p>
+ <ul>
+ <li>Staging view
+ <ul>
+ <li>Sort content by name if file names are shown first</li>
+ </ul>
+ </li>
+ <li>Repositories view
+ <ul>
+ <li>Sort tags in natural order</li>
+ <li>Sort folders before files in working directory</li>
+ </ul>
+ </li>
+ <li>Commit dialog
+ <ul>
+ <li>Add "Select for Commit" to files context menu</li>
+ <li>Replace help button with link to Staging view</li>
+ </ul>
+ </li>
+ <li>Cherry-pick
+ <ul>
+ <li>Show a rebase result dialog if cherry-picking fails</li>
+ <li>Provide more context in cherry-pick confirmation dialog</li>
+ </ul>
+ </li>
+ <li>Push
+ <ul>
+ <li>Simple push wizard links to Advanced push wizard</li>
+ <li>"Commit and Push" opens simple push wizard if no push refspec exists or current branch doesn't track a remote branch</li>
+ <li>Push Branch: Don't suggest branch name if upstream branch is a local branch</li>
+ <li>Assist in Push dialog and allow to push to custom refs</li>
+ <li>Show details about branch and commit in simple push dialog</li>
+ <li>Make source/destination branch more clear in push result dialog/confirmation</li>
+ </ul>
+ </li>
+ </ul>
+ <h2 id="Performance_Improvements">Performance Improvements</h2>
+ <ul>
+ <li>Staging view
+ <ul>
+ <li>Improved performance on large repositories/working directories</li>
+ <li>Don't reload repository on selection if repository stays the same</li>
+ </ul>
+ </li>
+ <li>Use faster method of setting styles in commit message details</li>
+ </ul><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="Bug-Fixes.html" title="Bug Fixes">
+ <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">Bug Fixes</td>
+ </tr>
+ </table>
+ </body>
+</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.4/Bug-Fixes.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/Bug-Fixes.html
index 0a330da03..bda03eeb9 100644
--- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.4/Bug-Fixes.html
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/Bug-Fixes.html
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>JGit 3.4 New and Noteworthy - Bug Fixes</title>
+ <title>EGit 3.5 New and Noteworthy - Bug Fixes</title>
<link type="text/css" rel="stylesheet" href="../../../book.css"/>
</head>
<body>
@@ -12,7 +12,7 @@
</tr>
<tr>
<td style="width: 20%" align="left">
- <a href="3.4.html" title="JGit 3.4 New and Noteworthy">
+ <a href="3.5.html" title="EGit 3.5 New and Noteworthy">
<img alt="Previous" border="0" src="../../../images/prev.gif"/>
</a>
</td>
@@ -24,25 +24,25 @@
</td>
</tr>
<tr>
- <td style="width: 20%" align="left" valign="top">JGit 3.4 New and Noteworthy</td>
+ <td style="width: 20%" align="left" valign="top">EGit 3.5 New and Noteworthy</td>
<td style="width: 60%" align="center"></td>
<td style="width: 20%" align="right" valign="top">Contributors</td>
</tr>
</table><hr/>
<h1 id="Bug_Fixes">Bug Fixes</h1>
<p>
- <a href="https://bugs.eclipse.org/bugs/buglist.cgi?resolution=FIXED&amp;resolution=DUPLICATE&amp;classification=Technology&amp;chfieldto=2014-06-25&amp;query_format=advanced&amp;chfield=bug_status&amp;chfieldfrom=2014-03-01&amp;bug_status=RESOLVED&amp;bug_status=VERIFIED&amp;bug_status=CLOSED&amp;product=JGit" target="egit_external">22 Bugs and 2 enhancement requests</a> were closed
+ <a href="https://bugs.eclipse.org/bugs/buglist.cgi?resolution=FIXED&amp;resolution=DUPLICATE&amp;classification=Technology&amp;list_id=10006180&amp;order=Importance&amp;product=EGit&amp;query_format=advanced&amp;target_milestone=3.5" target="egit_external">47 Bugs and 18 enhancement requests</a> were closed
</p><hr/>
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
<tr>
<td style="width: 20%" align="left">
- <a href="3.4.html" title="JGit 3.4 New and Noteworthy">
+ <a href="3.5.html" title="EGit 3.5 New and Noteworthy">
<img alt="Previous" border="0" src="../../../images/prev.gif"/>
</a>
</td>
<td style="width: 60%" align="center">
- <a href="3.4.html" title="JGit 3.4 New and Noteworthy">
- <img alt="JGit 3.4 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ <a href="3.5.html" title="EGit 3.5 New and Noteworthy">
+ <img alt="EGit 3.5 New and Noteworthy" border="0" src="../../../images/home.gif"/>
</a>
</td>
<td style="width: 20%" align="right">
@@ -52,7 +52,7 @@
</td>
</tr>
<tr>
- <td style="width: 20%" align="left" valign="top">JGit 3.4 New and Noteworthy</td>
+ <td style="width: 20%" align="left" valign="top">EGit 3.5 New and Noteworthy</td>
<td style="width: 60%" align="center"></td>
<td style="width: 20%" align="right" valign="top">Contributors</td>
</tr>
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.4/Contributors.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/Contributors.html
index d771ced47..83dae7ccd 100644
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.4/Contributors.html
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/Contributors.html
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>EGit 3.4 New and Noteworthy - Contributors</title>
+ <title>EGit 3.5 New and Noteworthy - Contributors</title>
<link type="text/css" rel="stylesheet" href="../../../book.css"/>
</head>
<body>
@@ -30,23 +30,24 @@
</tr>
</table><hr/>
<h1 id="Contributors">Contributors</h1>
- <p>The following 16 developers worked on this release:</p>
- <p>Andrea Guarinoni,
- Andreas Hermann,
- Arthur Daussy,
- Christian Georgi,
- Christian Halstrick,
- Gerd Zanker,
+ <p>The following 17 developers worked on this release:</p>
+ <p>Andreas Hermann,
+ Andrey Loskutov,
+ Axel Richard,
+ Carsten Pfeiffer,
Konrad Kügler,
Laurent Goubet,
Maik Schreiber,
- Marc Khouzam,
+ Marc-Andre Laperle,
+ Markus Keller,
Matthias Sohn,
- Michael Keppler,
+ Mickael Istria,
Robin Rosenberg,
Robin Stocker,
- Stefan Lay,
- Tomasz Zarna</p><hr/>
+ Szymon Ptaszkiewicz,
+ Tomasz Zarna,
+ Vadim Dmitriev,
+ Zehua Liu</p><hr/>
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
<tr>
<td style="width: 20%" align="left">
@@ -55,8 +56,8 @@
</a>
</td>
<td style="width: 60%" align="center">
- <a href="3.4.html" title="EGit 3.4 New and Noteworthy">
- <img alt="EGit 3.4 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ <a href="3.5.html" title="EGit 3.5 New and Noteworthy">
+ <img alt="EGit 3.5 New and Noteworthy" border="0" src="../../../images/home.gif"/>
</a>
</td>
<td style="width: 20%" align="right">
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.4/Updating-This-Document.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/Updating-This-Document.html
index 5107b5274..0a8bf6f33 100644
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.4/Updating-This-Document.html
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/Updating-This-Document.html
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>EGit 3.4 New and Noteworthy - Updating This Document</title>
+ <title>EGit 3.5 New and Noteworthy - Updating This Document</title>
<link type="text/css" rel="stylesheet" href="../../../book.css"/>
</head>
<body>
@@ -29,7 +29,7 @@
<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/New_and_Noteworthy/3.4" target="egit_external">http://wiki.eclipse.org/EGit/New_and_Noteworthy/3.4</a>
+ <a href="http://wiki.eclipse.org/EGit/New_and_Noteworthy/3.5" target="egit_external">http://wiki.eclipse.org/EGit/New_and_Noteworthy/3.5</a>
</p><hr/>
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
<tr>
@@ -39,8 +39,8 @@
</a>
</td>
<td style="width: 60%" align="center">
- <a href="3.4.html" title="EGit 3.4 New and Noteworthy">
- <img alt="EGit 3.4 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ <a href="3.5.html" title="EGit 3.5 New and Noteworthy">
+ <img alt="EGit 3.5 New and Noteworthy" border="0" src="../../../images/home.gif"/>
</a>
</td>
<td style="width: 20%" align="right"></td>
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/EGit-3.5-repository-submenu.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/EGit-3.5-repository-submenu.png
new file mode 100644
index 000000000..a3fd017cd
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/EGit-3.5-repository-submenu.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/EGit-3.5-stash-toolbar.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/EGit-3.5-stash-toolbar.png
new file mode 100644
index 000000000..be07c3580
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/EGit-3.5-stash-toolbar.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/EGit-3.5-stash-viewer.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/EGit-3.5-stash-viewer.png
new file mode 100644
index 000000000..bdc0ac6b4
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/EGit-3.5-stash-viewer.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/EGit-3.5-working-set-team-menu.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/EGit-3.5-working-set-team-menu.png
new file mode 100644
index 000000000..b83e0c6e5
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/EGit-3.5-working-set-team-menu.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/Egit-3.5-annotations-in-ruler.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/Egit-3.5-annotations-in-ruler.png
new file mode 100644
index 000000000..8a28009e0
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/Egit-3.5-annotations-in-ruler.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/Egit-3.5-history-delete-tag.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/Egit-3.5-history-delete-tag.png
new file mode 100644
index 000000000..71d3df71f
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/Egit-3.5-history-delete-tag.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/Egit-3.5-history-find-tag-branch.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/Egit-3.5-history-find-tag-branch.png
new file mode 100644
index 000000000..6923ecee9
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/Egit-3.5-history-find-tag-branch.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/Egit-3.5-interactive-rebase-plan-menu.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/Egit-3.5-interactive-rebase-plan-menu.png
new file mode 100644
index 000000000..63ac63ceb
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/Egit-3.5-interactive-rebase-plan-menu.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/Egit-3.5-interactive-rebase.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/Egit-3.5-interactive-rebase.png
new file mode 100644
index 000000000..1d4a42c8a
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/Egit-3.5-interactive-rebase.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/Egit-3.5-multi-cherry-pick.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/Egit-3.5-multi-cherry-pick.png
new file mode 100644
index 000000000..e36a37f61
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/Egit-3.5-multi-cherry-pick.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/Egit-3.5-rebase-options.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/Egit-3.5-rebase-options.png
new file mode 100644
index 000000000..7c747d794
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.5/images/Egit-3.5-rebase-options.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html
index 40e7e5ba0..5e632f43d 100644
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html
@@ -106,8 +106,9 @@
<b>Finish</b>
</li>
</ul>
- <p>&lt;br
- /&gt;</p>
+ <p>
+ <br/>
+ </p>
<h2 id="Starting_from_existing_Git_Repositories">Starting from existing Git Repositories</h2>
<p>In order to work with the content of a Git repository in the Eclipse workbench, the contained files and folders must be imported as projects. In principle, this import can be done using the generic "New Project" or "Import..." wizards, since the working directory of a Git Repository is just a normal directory in the local file system. However, the newly created projects would still have to be shared manually with Git. The "Import Projects from Git" wizard integrates project import and sharing and also offers some extra convenience.</p>
<h3 id="Starting_the_import_wizard">Starting the import wizard</h3>
@@ -648,8 +649,9 @@
<a href="http://code.google.com/p/gerrit/" target="egit_external">http://code.google.com/p/gerrit/</a>), EGit allows you to conveniently push and fetch changes to and from the Gerrit servers.
</p>
<h3 id="Enabling_Gerrit_for_a_repository">Enabling Gerrit for a repository</h3>
- <p>Gerrit operation will not appear in any menus unless you configure your repository first. To do that open the Git Repositories view browse down to the
- <b>Remote</b> that the represent the Git repository server you want to use.
+ <p>Gerrit operation will not appear in any menus unless you configure your repository first. To do that, open the Git Repositories view and browse down to the
+ <b>Remote</b> that represents the Git repository server you want to use and select
+ <b>Gerrit Configuration...</b>.
</p>
<h3 id="Pushing_a_change_to_a_Gerrit_Code_Review_Server">Pushing a change to a Gerrit Code Review Server</h3>
<p>Right-click on a project and select
@@ -669,6 +671,17 @@
<b>Finish</b>, the currently checked out commit will be pushed to the Gerrit branch specified. Also, the URI and Gerrit Branch values will be remembered and suggested again when the dialog is opened again later.
</p>
<p>This allows for more flexibility when working with different Gerrit branches in parallel (e.g. frequently switching between development and hotfixing).</p>
+ <h4 id="Editing_a_change">Editing a change</h4>
+ <p>When a change has been pushed to Gerrit and the reviewers suggest to make some improvements, a new patch set for the change has to be uploaded. First, edit the commit(s):</p>
+ <ul>
+ <li>In case you have one commit corresponding to one change, you can amend the commit (see
+ <a href="#Amending_Commits">Amending Commits</a>).
+ </li>
+ <li>In case you have multiple dependent commits and need to edit a commit other than the last one, you can do an interactive rebase (see
+ <a href="#Interactive_Rebase">Interactive Rebase</a>). Alternatively, check out the commit you want to edit, amend it and then cherry-pick the later commits on top (this is what interactive rebase does for you).
+ </li>
+ </ul>
+ <p>Then push again to the same branch. Gerrit will detect that you are updating existing changes and will add new patch sets.</p>
<h3 id="Fetching_a_change_from_a_Gerrit_Code_Review_Server">Fetching a change from a Gerrit Code Review Server</h3>
<p>Right-click on a project and select
<b>Team &gt; Remote &gt; Fetch from Gerrit...</b> or right-click on a Repository node in the Repositories View and select
@@ -722,7 +735,7 @@
<img border="0" src="images/01-TextDecorations.png"/>
</p>
<p>For files and folders there are the variables <tt>"name"</tt>, <tt>"dirty"</tt> and <tt>"staged"</tt>. <tt>"Dirty"</tt> and <tt>"staged"</tt> are flags; if they are true, the text after the colon is displayed.</p>
- <p>For projects there are the additional variables <tt>"repository"</tt> and <tt>"branch"</tt>. The <tt>"repository"</tt> variable displays the name of the repository.</p>
+ <p>For projects there are the additional variables <tt>"repository"</tt>, <tt>"branch"</tt> and <tt>"branch_status"</tt>. The <tt>"repository"</tt> variable displays the name of the repository.</p>
<p>The <tt>"branch"</tt> variable displays the name of the currently checked out branch. If no branch is checked out, the decoration shows the shortened name of the commit (first seven characters followed by ellipsis). If tags and/or remote branches are pointing to this commit, a "best guess" heuristic is applied to also show this information: tags take precedence over remote branches, if several tags apply, the newest one is displayed; if there are several remote branches or tags have no modification date, then alphabetic sorting is applied and the last one is shown. Example: the checked out commit <tt>
<b>e49f576...</b></tt> refers to tag <tt>
<b>v.0.7.1</b></tt> of repository <tt>
@@ -732,6 +745,18 @@
<p>
<img border="0" src="images/03-ExampleDecoration.png"/>
</p>
+ <p>The <tt>"branch_status"</tt> variable shows the status of the local branch compared to the remote-tracking branch that is set as upstream:</p>
+ <ul>
+ <li>↑N – The local branch has
+ <i>N</i> commits that are not yet on the remote-tracking branch. This can be read as "N commits to push".
+ </li>
+ <li>↓M – The remote-tracking branch has
+ <i>M</i> commits that are not on the local branch. This can be read as "M commits to merge/rebase".
+ </li>
+ <li>↑N↓M – The local branch and the remote-tracking branch have diverged (the two above apply both).</li>
+ <li>– Empty if the local branch and the remote-tracking branch have the same state.</li>
+ </ul>
+ <p>The status variable can be used with a leading space like this: <tt>{ branch_status}</tt>. This results in the space only being added when the status is not empty.</p>
<h4 id="Icon_Decorations">Icon Decorations</h4>
<p>Icon decorations appear on the lower right corner of the icon displayed in front of the label. They can be configured on the Preferences dialog under
<b>Team &gt; Git &gt; Label Decorations</b> on the tab
@@ -1051,7 +1076,7 @@ Signed-off-by: William Shakespeare &lt;will.from@the.past&gt;
<b>Show untracked Files</b> is selected by default.
</p>
<h4 id="Amending_Commits">Amending Commits</h4>
- <p>If you recognize that you missed something when committing a change you may fix this: open the commit dialog again and specify that the current commit shall "amend" the previous commit in the current branch. The new commit will then replace the previous one. This feature is often used to correct incorrect commits before they are published to other repositories.</p>
+ <p>If you recognize that you missed something when committing a change you may fix this: open the staging view or commit dialog again and specify that the current commit shall "amend" the previous commit in the current branch. The new commit will then replace the previous one. This feature is often used to correct incorrect commits before they are published to other repositories.</p>
<p>
<b>Note:</b> do not amend commits if they have already been published to a shared repository since this may disturb others if they already based their changes on the published change.
</p>
@@ -1067,8 +1092,8 @@ Signed-off-by: William Shakespeare &lt;will.from@the.past&gt;
<p>
<img border="0" src="images/EGit-Corrected.png"/>
</p>
- <p>then open the Staging View or Commit Dialog again and select the option
- <b>Amend previous commit</b> in the toolbar.
+ <p>Then open the Staging View or Commit Dialog again and select the
+ <b>Amend Previous Commit</b> icon in the toolbar.
</p>
<p>The commit message of your previous commit (the one you want to replace) is then 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 and in order not to clutter the history of your project with unneeded commits you should amend the commit.</p>
@@ -1300,14 +1325,19 @@ Signed-off-by: William Shakespeare &lt;will.from@the.past&gt;
<h3 id="Branch_Creation_Dialog">Branch Creation Dialog</h3>
<p>There are several actions available to create a local branch. All these actions use the Branch Creation dialog:</p>
<p>
- <img border="0" src="images/Egit-3.1-CreateBranchDialog.png"/>
+ <img border="0" src="images/Egit-3.5-CreateBranchDialog.png"/>
</p>
- <p>The combo in the upper part allows to select the branch or commit the new branch shall be based on. Typically, this is a remote tracking branch, but it could be any branch or commit in the repository (selecting a local branch is not recommended if you are working with a remote repository).</p>
- <p>The "Pull Strategy" group is only visible when a branch is selected in the combo and allows to override the default setup for the "upstream configuration" which is helpful when fetching and pushing, but particularly when pulling. Depending on the selected option the following configuration can be chosen:</p>
+ <p>Enter the name of the local branch you want to create. If a source branch is selected which is a remote tracking branch EGit will suggest to create the new local branch with the same name.</p>
+ <p>Click
+ <b>Select...</b> to select the source branch the new branch shall be based on. Typically, this is a remote tracking branch, but it could be any branch or commit in the repository (selecting a local branch is not recommended if you are working with a remote repository).
+ If you want to base the new branch on a commit no branch is referring to then click
+ <b>Create Branch...</b> from the commit shown in the History View.
+ </p>
+ <p>When a source branch is selected you can configure the "upstream configuration" of the new branch which is helpful when fetching and pushing, but particularly when pulling. Depending on the selected option the following configuration can be chosen:</p>
<ul>
- <li>Rebase: When pulling, new changes will be fetched from upstream and the remote tracking branch will be updated. Then the current local branch will be rebased onto the updated remote tracking branch</li>
- <li>Merge: When pulling, the changes will be fetched from upstream and the remote tracking branch will be updated. Then the current local branch will be merged with the new changes. This is the default if the new branch is based on a remote tracking branch (but this default may be overridden by specific repository configuration)</li>
- <li>None: When pulling, no specific upstream configuration will be done for the new branch; however, if a default remote exists (a remote with name "origin", pull will try to use the configuration of this remote; this is the default if the new branch is not based on a remote tracking branch</li>
+ <li>"Merge upstream commits into local branch": When pulling, the changes will be fetched from upstream and the remote tracking branch will be updated. Then the current local branch will be merged with the new changes. This is the default if the new branch is based on a remote tracking branch (but this default may be overridden by specific repository configuration)</li>
+ <li>"Rebase commits of local branch onto upstream": When pulling, new changes will be fetched from upstream and the remote tracking branch will be updated. Then the current local branch will be rebased onto the updated remote tracking branch</li>
+ <li>if you uncheck the option "Configure upstream for push and pull"): When pulling, no specific upstream configuration will be done for the new branch; however, if a default remote exists (a remote with name "origin", pull will try to use the configuration of this remote; this is the default if the new branch is not based on a remote tracking branch</li>
</ul>
<p>You may view and edit the upstream configuration in the
<a href="#Repository_Configuration">repository configuration</a> or by selecting
@@ -1315,6 +1345,15 @@ Signed-off-by: William Shakespeare &lt;will.from@the.past&gt;
</p>
<p>EGit also supports the git configuration parameter <code>branch.autosetuprebase</code>, set it to <code>always</code> if you want to use the rebase pull strategy by default. If you set this in the repository configuration this is used for all local branches created based on a remote tracking branch in this repository, if you set it in your user configuration it will be used for all your repositories.</p>
<p>In the lower part, you can decide whether the new branch shall be checked out immediately.</p>
+ <h3 id="Configure_Branch_Dialog">Configure Branch Dialog</h3>
+ <p>
+ <img border="0" src="images/Egit-3.5-ConfigureBranchDialog.png"/>
+ </p>
+ <p>Click
+ <b>Configure Branch...</b> on a branch in the Repositories View in order to change the upstream configuration of a local branch.
+ Select which remote ("." means the local repository) and branch the selected local branch should track. Check "Rebase" if you want
+ pull to rebase the local branch onto new changes arriving for the tracked branch, otherwise pull will merge new changes arriving for the tracked branch.
+ </p>
<h2 id="Merging">Merging</h2>
<p>A merge incorporates changes from another branch or tag, since the time their histories diverged from the current branch, into the currently checked out branch.</p>
<h3 id="Merging_a_branch_or_a_tag_into_the_current_branch">Merging a branch or a tag into the current branch</h3>
@@ -1452,6 +1491,13 @@ Signed-off-by: William Shakespeare &lt;will.from@the.past&gt;
<p>
<img border="0" src="images/Conflicts.png"/>
</p>
+ <p>Alternativley, it's easy to find a list of all conflicting files in the staging area.
+ Open the
+ <b>Git Staging</b> view. The conflicting files with decorators will be seen
+ on the left.
+
+ <img border="0" src="images/Git_merge_conflict.png"/>
+ </p>
<h4 id="Editing_conflicting_files">Editing conflicting files</h4>
<p>In the file content, the area where a pair of conflicting changes happened is marked with markers &lt;&lt;&lt;&lt;&lt;&lt;&lt;, =======, and &gt;&gt;&gt;&gt;&gt;&gt;&gt;. The part before the ======= is typically your side, and the part afterwards is typically their side (see
<a href="http://www.kernel.org/pub/software/scm/git/docs/git-merge.html#_how_conflicts_are_presented" target="egit_external">http://www.kernel.org/pub/software/scm/git/docs/git-merge.html#_how_conflicts_are_presented</a> for more details).
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/User-Guide.html b/org.eclipse.egit.doc/help/EGit/User_Guide/User-Guide.html
index 06bcc3e41..2b7901fdc 100644
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/User-Guide.html
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/User-Guide.html
@@ -81,7 +81,6 @@
</p>
<p>If the <code>HOME</code> variable is not defined the home directory will be calculated by concatenating <code>HOMEDRIVE</code> and <code>HOMEPATH</code>.</p>
<p>If both <code>HOME</code> and <code>HOMEDRIVE</code> are not defined <code>HOMESHARE</code> will be used.</p>
- <p><small><font color="red">If <code>HOMEPATH</code> is not defined, what happens?</font></small></p>
<p>EGit shows a warning if <code>HOME</code> is not defined explicitly. Keep in mind that if you set the HOME environment variable while Eclipse is running, you will still see following warning. You will have to restart Eclipse for it to recognize the HOME value.</p>
<p>
<img border="0" src="images/Egit_no_home.png"/>
@@ -225,11 +224,13 @@
<p>
<img border="0" src="images/Egit-0.11-getstarted-compare.png"/>
</p>
- <p>&lt;br
- /&gt;
- <b>Congratulations, you just have mastered your first project using Git&nbsp;!</b>&lt;br
- /&gt;&lt;br
- /&gt;
+ <p>
+ <br/>
+
+ <b>Congratulations, you just have mastered your first project using Git&nbsp;!</b>
+
+ <br/>
+ <br/>
</p>
<h2 id="GitHub_Tutorial">GitHub Tutorial</h2>
<h3 id="Create_Local_Repository">Create Local Repository</h3>
@@ -282,6 +283,9 @@
<a href="https://github.com/account" target="egit_external">GitHub account settings</a>.
</li>
</ul>
+ <p>Further information about advanced SSH configuration (such as using Putty or another SSH agent with EGit) is available in the
+ <a href="http://wiki.eclipse.org/EGit/FAQ#SSH_config" title="EGit/FAQ#SSH_config" target="egit_external">EGit FAQ (section SSH)</a>.
+ </p>
<h3 id="Push_Upstream">Push Upstream</h3>
<ul>
<li>Click
@@ -340,8 +344,9 @@
<p>
<img border="0" src="images/Egit-0.10-github-pushed-repo.png"/>
</p>
- <p>&lt;br
- /&gt;</p>
+ <p>
+ <br/>
+ </p>
<h2 id="EclipseCon_2012_Git_Tutorial">EclipseCon 2012 Git Tutorial</h2>
<p>Find all exercises and the slides
<a href="https://docs.google.com/open?id=0B4F_gjXVrHZVRXkydE0xVFBRRkc1WUpEcXdwQ2I1dw" target="egit_external">here</a>.
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-0.10-RebaseConflictDialog.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-0.10-RebaseConflictDialog.png
deleted file mode 100644
index 7a464bd42..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-0.10-RebaseConflictDialog.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-0.7-ViewDiffInResourceHistory.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-0.7-ViewDiffInResourceHistory.png
deleted file mode 100644
index 4b4d60d8f..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-0.7-ViewDiffInResourceHistory.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-ConfirmProjectRemoval.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-ConfirmProjectRemoval.png
deleted file mode 100644
index c898a6f0d..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-ConfirmProjectRemoval.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-ConfirmRepositoryDeletion.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-ConfirmRepositoryDeletion.png
deleted file mode 100644
index 65127d3fe..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-ConfirmRepositoryDeletion.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-repoview-refmenu.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-repoview-refmenu.png
deleted file mode 100644
index fb639d5c3..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-repoview-refmenu.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-BranchCreationDialog.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-BranchCreationDialog.png
deleted file mode 100644
index d795c4220..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-BranchCreationDialog.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-ConfigureFetchFromUpstream.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-ConfigureFetchFromUpstream.png
deleted file mode 100644
index 6359d1986..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-ConfigureFetchFromUpstream.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-ConfigurePushToUpstream.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-ConfigurePushToUpstream.png
deleted file mode 100644
index 5ae2752f8..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-ConfigurePushToUpstream.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-FetchResultDialog.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-FetchResultDialog.png
deleted file mode 100644
index f655c6347..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-FetchResultDialog.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-fetchChangeFromGerritDialog.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-fetchChangeFromGerritDialog.png
deleted file mode 100644
index d0d9e2c92..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-fetchChangeFromGerritDialog.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-workbench-menu.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-workbench-menu.png
deleted file mode 100644
index 9c28b3d21..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-workbench-menu.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-workbench-toolbar.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-workbench-toolbar.png
deleted file mode 100644
index c6f2abed5..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-workbench-toolbar.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-tag-create.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-tag-create.png
deleted file mode 100644
index 88cf90043..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-tag-create.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-tag-replace.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-tag-replace.png
deleted file mode 100644
index 83933e0a8..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-tag-replace.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-commit-dialog-amend.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-commit-dialog-amend.png
deleted file mode 100644
index 0516c5609..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-commit-dialog-amend.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-fetch-wizard-result.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-fetch-wizard-result.png
deleted file mode 100644
index 00ad72f49..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-fetch-wizard-result.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-push-result.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-push-result.png
deleted file mode 100644
index f1be054b5..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-push-wizard-push-result.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.0-blame-ruler.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.0-blame-ruler.png
deleted file mode 100644
index 97e373eac..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.0-blame-ruler.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-project-menu-advanced.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-project-menu-advanced.png
deleted file mode 100644
index 115969a1b..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-project-menu-advanced.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-project-menu-main.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-project-menu-main.png
deleted file mode 100644
index 9c92e17eb..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-project-menu-main.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-project-menu-remote.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-project-menu-remote.png
deleted file mode 100644
index 0df4f5b12..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-project-menu-remote.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-repoview-branch-menu.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-repoview-branch-menu.png
deleted file mode 100644
index 4170bba22..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-repoview-branch-menu.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-repoview-fetchconfig-menu.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-repoview-fetchconfig-menu.png
deleted file mode 100644
index 019b789f6..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-repoview-fetchconfig-menu.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-repoview-pushconfig-menu.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-repoview-pushconfig-menu.png
deleted file mode 100644
index ded6e74e4..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-repoview-pushconfig-menu.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-repoview-repository-menu.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-repoview-repository-menu.png
deleted file mode 100644
index ef144cdc0..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-repoview-repository-menu.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-repoview-tag-menu.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-repoview-tag-menu.png
deleted file mode 100644
index 055dfcbf2..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-repoview-tag-menu.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-repoview-workingtree-menu.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-repoview-workingtree-menu.png
deleted file mode 100644
index c33922093..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-repoview-workingtree-menu.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-resource-menu.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-resource-menu.png
deleted file mode 100644
index 6ff915b01..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-resource-menu.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-staging-view.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-staging-view.png
deleted file mode 100644
index 010b4b561..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-1.2-staging-view.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-2.1-history-view-menu.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-2.1-history-view-menu.png
deleted file mode 100644
index 63d9825f7..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-2.1-history-view-menu.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-2.1-pushChangeToGerritDialog.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-2.1-pushChangeToGerritDialog.png
deleted file mode 100644
index f9859be22..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-2.1-pushChangeToGerritDialog.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-3.1-CreateBranchDialog.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-3.1-CreateBranchDialog.png
deleted file mode 100644
index d83be3fb9..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-3.1-CreateBranchDialog.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-3.5-ConfigureBranchDialog.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-3.5-ConfigureBranchDialog.png
new file mode 100644
index 000000000..f5f767a31
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-3.5-ConfigureBranchDialog.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-3.5-CreateBranchDialog.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-3.5-CreateBranchDialog.png
new file mode 100644
index 000000000..ed50f69e4
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-3.5-CreateBranchDialog.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Filters.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Filters.png
deleted file mode 100644
index b4dc38f68..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Filters.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Git_merge_conflict.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Git_merge_conflict.png
new file mode 100644
index 000000000..e6a1e88fe
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Git_merge_conflict.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/MergeDialog.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/MergeDialog.png
deleted file mode 100644
index b66d84be7..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/MergeDialog.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/MergeResultMerged.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/MergeResultMerged.png
deleted file mode 100644
index cc9262f88..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/MergeResultMerged.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/TagCreation.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/TagCreation.png
deleted file mode 100644
index f94809077..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/TagCreation.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.4/3.4.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.5/3.5.html
index 5f4f86f38..f02475249 100644
--- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.4/3.4.html
+++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.5/3.5.html
@@ -2,13 +2,13 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>JGit 3.4 New and Noteworthy</title>
+ <title>JGit 3.5 New and Noteworthy</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">JGit 3.4 New and Noteworthy</th>
+ <th style="width: 100%" align="center" colspan="3">JGit 3.5 New and Noteworthy</th>
</tr>
<tr>
<td style="width: 20%" align="left"></td>
@@ -28,44 +28,36 @@
<h1 id="JGit">JGit</h1>
<h2 id="Features">Features</h2>
<ul>
- <li>Improved layout of branches in the commit graph</li>
- <li>Allow to include untracked files in stash operations.</li>
- <li>Support for SPNEGO HTTP authentication</li>
- <li>Added API to permit the setting of additional HTTP headers</li>
- </ul>
- <ul>
- <li>ArchiveCommand now supports selecting one or more paths.</li>
- <li>CherryPickCommand now supports option "--mainline" to pick merges</li>
- <li>ListBranchCommand now supports option "--contains"</li>
- </ul>
- <ul>
- <li>Automatically reload SSH "known_hosts" file when it was modified</li>
- <li>Improved validation of tree names in ObjectChecker</li>
- <li>Blame correctly in the presence of conflicting merges</li>
- <li>Take "core.autocrlf" into account for blame annotations</li>
- </ul>
- <ul>
- <li>Streaming delta support was removed from JGit since it was too slow to be useful</li>
+ <li>Added parser and credentials provider for .netrc files</li>
+ <li>RebaseCommand support for option --preserve-merges</li>
+ <li>CommitCommand support for committing merges during rebase</li>
+ <li>Pull with rebase now supports option --preserve-merges</li>
+ <li>CherryPickCommand support for option --no-commit</li>
+ <li>Enhance BranchConfig API to expose branch.* options</li>
+ <li>RepoCommand
+ <ul>
+ <li>Allow projects without path attribute in manifest</li>
+ <li>Handle repo manifest file without default remote</li>
+ <li>Support remote aliases in repo manifest</li>
+ <li>Support non-default remotes in project tag</li>
+ <li>Add support to &lt;include&gt; tag in repo manifest xml</li>
+ </ul>
+ </li>
</ul>
<h2 id="Command_Line">Command Line</h2>
<ul>
- <li>Checkout command now supports "-- &lt;path&gt;" parameter</li>
- <li>Branch command now supports option "--contains"</li>
- <li>Clone command now supports option "--no-checkout"</li>
- <li>New Gerrit "repo" command, see
- <a href="https://code.google.com/p/git-repo/" target="egit_external">https://code.google.com/p/git-repo/</a>
- </li>
+ <li>Merge command support for option -m</li>
+ <li>Use credentials from .netrc if available</li>
</ul>
<h2 id="Performance_Improvements">Performance Improvements</h2>
<ul>
- <li>Several performance improvements for blame annotations</li>
+ <li>Process most in-core merges without local temp files</li>
+ <li>Small performance optimization for ignore rules matcher</li>
</ul>
<h2 id="Build_and_Release_Engineering">Build and Release Engineering</h2>
<ul>
- <li>Allow full compilation on Java 8.</li>
- <li>Update build to use Orbit R20140525021250 (Luna)</li>
- <li>Update build to use Tycho 0.20.0</li>
- <li>Add script to create JGit release</li>
+ <li>Updated Maven plugins used in build to latest versions</li>
+ <li>Enable NLS / TranslationBundle to be used in OSGi</li>
</ul><hr/>
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
<tr>
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.4/Bug-Fixes.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.5/Bug-Fixes.html
index 619c028f2..f19b5dec8 100644
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.4/Bug-Fixes.html
+++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.5/Bug-Fixes.html
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>EGit 3.4 New and Noteworthy - Bug Fixes</title>
+ <title>JGit 3.5 New and Noteworthy - Bug Fixes</title>
<link type="text/css" rel="stylesheet" href="../../../book.css"/>
</head>
<body>
@@ -12,7 +12,7 @@
</tr>
<tr>
<td style="width: 20%" align="left">
- <a href="3.4.html" title="EGit 3.4 New and Noteworthy">
+ <a href="3.5.html" title="JGit 3.5 New and Noteworthy">
<img alt="Previous" border="0" src="../../../images/prev.gif"/>
</a>
</td>
@@ -24,25 +24,25 @@
</td>
</tr>
<tr>
- <td style="width: 20%" align="left" valign="top">EGit 3.4 New and Noteworthy</td>
+ <td style="width: 20%" align="left" valign="top">JGit 3.5 New and Noteworthy</td>
<td style="width: 60%" align="center"></td>
<td style="width: 20%" align="right" valign="top">Contributors</td>
</tr>
</table><hr/>
<h1 id="Bug_Fixes">Bug Fixes</h1>
<p>
- <a href="https://bugs.eclipse.org/bugs/buglist.cgi?list_id=3805932&amp;resolution=FIXED&amp;resolution=DUPLICATE&amp;classification=Technology&amp;chfieldto=2014-06-25&amp;chfield=resolution&amp;query_format=advanced&amp;chfieldfrom=2014-03-01&amp;bug_status=RESOLVED&amp;bug_status=VERIFIED&amp;bug_status=CLOSED&amp;product=EGit" target="egit_external">72 Bugs and 14 enhancement requests</a> were closed
+ <a href="https://bugs.eclipse.org/bugs/buglist.cgi?classification=Technology&amp;list_id=10006180&amp;order=Importance&amp;product=JGit&amp;query_format=advanced&amp;resolution=FIXED&amp;resolution=DUPLICATE&amp;target_milestone=3.5" target="egit_external">15 Bugs and 3 enhancement requests</a> were closed
</p><hr/>
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
<tr>
<td style="width: 20%" align="left">
- <a href="3.4.html" title="EGit 3.4 New and Noteworthy">
+ <a href="3.5.html" title="JGit 3.5 New and Noteworthy">
<img alt="Previous" border="0" src="../../../images/prev.gif"/>
</a>
</td>
<td style="width: 60%" align="center">
- <a href="3.4.html" title="EGit 3.4 New and Noteworthy">
- <img alt="EGit 3.4 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ <a href="3.5.html" title="JGit 3.5 New and Noteworthy">
+ <img alt="JGit 3.5 New and Noteworthy" border="0" src="../../../images/home.gif"/>
</a>
</td>
<td style="width: 20%" align="right">
@@ -52,7 +52,7 @@
</td>
</tr>
<tr>
- <td style="width: 20%" align="left" valign="top">EGit 3.4 New and Noteworthy</td>
+ <td style="width: 20%" align="left" valign="top">JGit 3.5 New and Noteworthy</td>
<td style="width: 60%" align="center"></td>
<td style="width: 20%" align="right" valign="top">Contributors</td>
</tr>
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.4/Contributors.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.5/Contributors.html
index 82d1ef646..4a53e4842 100644
--- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.4/Contributors.html
+++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.5/Contributors.html
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>JGit 3.4 New and Noteworthy - Contributors</title>
+ <title>JGit 3.5 New and Noteworthy - Contributors</title>
<link type="text/css" rel="stylesheet" href="../../../book.css"/>
</head>
<body>
@@ -30,31 +30,28 @@
</tr>
</table><hr/>
<h1 id="Contributors">Contributors</h1>
- <p>The following 25 developers worked on this release of JGit:</p>
- <p>Alexander Kurtakov,
- Andreas Hermann,
- Bogdan Gheorghe,
- Christian Halstrick,
- Dave Borowitz,
- Doug Kelly,
- Guillaume Nodet,
- Gustaf Lundh,
- Jean-Jacques Lafay,
- Jonathan Nieder,
- Kaloyan Raev,
- Konrad Kügler,
- Laurent Goubet,
- Laurent Goujon,
- Marc Strapetz,
- Matthias Sohn,
+ <p>The following 22 developers worked on this release of JGit:</p>
+ <p>Alexey Kuznetsov,
+ Andrey Loskutov,
+ Anton Bannykh,
+ Axel Richard,
+ Christian Halstrick,
+ Dani Megert,
+ Dave Borowitz,
+ Hugo Arès,
+ Kevin Sawicki,
+ Konrad Kügler,
+ Laurent Goubet,
+ Maik Schreiber,
+ Marc Strapetz,
+ Matthias Sohn,
+ Roberto Tyley,
Robin Rosenberg,
- Robin Stocker,
- Rüdiger Herrmann,
- Shaul Zorea,
- Shawn Pearce,
- Stefan Lay,
- Sven Selberg,
- Tomasz Zarna,
+ Robin Stocker,
+ Rüdiger Herrmann,
+ Saša Živkov,
+ Shawn Pearce,
+ Yi EungJun,
Yuxuan 'fishy' Wang</p><hr/>
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
<tr>
@@ -64,8 +61,8 @@
</a>
</td>
<td style="width: 60%" align="center">
- <a href="3.4.html" title="JGit 3.4 New and Noteworthy">
- <img alt="JGit 3.4 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ <a href="3.5.html" title="JGit 3.5 New and Noteworthy">
+ <img alt="JGit 3.5 New and Noteworthy" border="0" src="../../../images/home.gif"/>
</a>
</td>
<td style="width: 20%" align="right">
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.4/Updating-This-Document.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.5/Updating-This-Document.html
index f90e06764..7e6f17345 100644
--- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.4/Updating-This-Document.html
+++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.5/Updating-This-Document.html
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>JGit 3.4 New and Noteworthy - Updating This Document</title>
+ <title>JGit 3.5 New and Noteworthy - Updating This Document</title>
<link type="text/css" rel="stylesheet" href="../../../book.css"/>
</head>
<body>
@@ -29,7 +29,7 @@
<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/JGit/New_and_Noteworthy/3.4" target="egit_external">http://wiki.eclipse.org/JGit/New_and_Noteworthy/3.4</a>
+ <a href="http://wiki.eclipse.org/JGit/New_and_Noteworthy/3.5" target="egit_external">http://wiki.eclipse.org/JGit/New_and_Noteworthy/3.5</a>
</p><hr/>
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
<tr>
@@ -39,8 +39,8 @@
</a>
</td>
<td style="width: 60%" align="center">
- <a href="3.4.html" title="JGit 3.4 New and Noteworthy">
- <img alt="JGit 3.4 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ <a href="3.5.html" title="JGit 3.5 New and Noteworthy">
+ <img alt="JGit 3.5 New and Noteworthy" border="0" src="../../../images/home.gif"/>
</a>
</td>
<td style="width: 20%" align="right"></td>
diff --git a/org.eclipse.egit.doc/help/JGit/User_Guide/User-Guide.html b/org.eclipse.egit.doc/help/JGit/User_Guide/User-Guide.html
index 3324bfb44..011be6415 100644
--- a/org.eclipse.egit.doc/help/JGit/User_Guide/User-Guide.html
+++ b/org.eclipse.egit.doc/help/JGit/User_Guide/User-Guide.html
@@ -36,7 +36,7 @@
<p>You are probably familiar with the git command line interface (CLI) that can be used from the shell or in scripts. JGit comes with its own small CLI, which, although not as feature-full as the git CLI, is a good way to showcase what JGIt can do. Furthermore, the programs serve as an excellent source of inspiration for how to accomplish different tasks. </p>
<h3 id="Building_the_JGit_CLI">Building the JGit CLI</h3>
<p>Assuming that you have the EGit git repository cloned and ready, build the jgit binary by running the jgit maven build (see
- <a href="http://wiki.eclipse.org/EGit/Contributor_Guide#JGit" title="EGit/Contributor_Guide#JGit" target="egit_external">the Contributor Guide</a>):
+ <a href="../../EGit/Contributor_Guide/Obtaining-Sources.html#JGit" title="EGit/Contributor_Guide#JGit">the Contributor Guide</a>):
</p>
<pre>~/src/jgit$ mvn clean install
</pre>
diff --git a/org.eclipse.egit.doc/help/toc.xml b/org.eclipse.egit.doc/help/toc.xml
index 174a7a6c3..2c9e2fd84 100644
--- a/org.eclipse.egit.doc/help/toc.xml
+++ b/org.eclipse.egit.doc/help/toc.xml
@@ -94,7 +94,9 @@
</topic>
<topic href="help/EGit/User_Guide/Tasks.html#Working_with_Gerrit" label="Working with Gerrit">
<topic href="help/EGit/User_Guide/Tasks.html#Enabling_Gerrit_for_a_repository" label="Enabling Gerrit for a repository"></topic>
- <topic href="help/EGit/User_Guide/Tasks.html#Pushing_a_change_to_a_Gerrit_Code_Review_Server" label="Pushing a change to a Gerrit Code Review Server"></topic>
+ <topic href="help/EGit/User_Guide/Tasks.html#Pushing_a_change_to_a_Gerrit_Code_Review_Server" label="Pushing a change to a Gerrit Code Review Server">
+ <topic href="help/EGit/User_Guide/Tasks.html#Editing_a_change" label="Editing a change"></topic>
+ </topic>
<topic href="help/EGit/User_Guide/Tasks.html#Fetching_a_change_from_a_Gerrit_Code_Review_Server" label="Fetching a change from a Gerrit Code Review Server"></topic>
</topic>
<topic href="help/EGit/User_Guide/Tasks.html#Inspecting_the_state_of_the_Repository" label="Inspecting the state of the Repository">
@@ -172,6 +174,7 @@
<topic href="help/EGit/User_Guide/Tasks.html#From_the_History_View_4" label="From the History View"></topic>
</topic>
<topic href="help/EGit/User_Guide/Tasks.html#Branch_Creation_Dialog" label="Branch Creation Dialog"></topic>
+ <topic href="help/EGit/User_Guide/Tasks.html#Configure_Branch_Dialog" label="Configure Branch Dialog"></topic>
</topic>
<topic href="help/EGit/User_Guide/Tasks.html#Merging" label="Merging">
<topic href="help/EGit/User_Guide/Tasks.html#Merging_a_branch_or_a_tag_into_the_current_branch" label="Merging a branch or a tag into the current branch">
@@ -434,27 +437,33 @@
</topic>
<topic href="help/JGit/User_Guide/Updating-This-Document.html" label="Updating This Document"></topic>
</topic>
- <topic href="help/EGit/New_and_Noteworthy/3.4/3.4.html" label="EGit 3.4 New and Noteworthy">
- <topic href="help/EGit/New_and_Noteworthy/3.4/3.4.html" label="EGit">
- <topic href="help/EGit/New_and_Noteworthy/3.4/3.4.html#Features" label="Features"></topic>
- <topic href="help/EGit/New_and_Noteworthy/3.4/3.4.html#Usability_Improvements" label="Usability Improvements"></topic>
- <topic href="help/EGit/New_and_Noteworthy/3.4/3.4.html#Performance_Improvements" label="Performance Improvements"></topic>
- <topic href="help/EGit/New_and_Noteworthy/3.4/3.4.html#Build_and_Release_Engineering" label="Build and Release Engineering"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/3.5/3.5.html" label="EGit 3.5 New and Noteworthy">
+ <topic href="help/EGit/New_and_Noteworthy/3.5/3.5.html" label="EGit">
+ <topic href="help/EGit/New_and_Noteworthy/3.5/3.5.html#Features" label="Features">
+ <topic href="help/EGit/New_and_Noteworthy/3.5/3.5.html#Interactive_Rebase_View" label="Interactive Rebase View"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/3.5/3.5.html#History_View" label="History View"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/3.5/3.5.html#Rebase" label="Rebase"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/3.5/3.5.html#Stash_Support" label="Stash Support"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/3.5/3.5.html#Menus" label="Menus"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/3.5/3.5.html#GitHub_Connector" label="GitHub Connector"></topic>
+ </topic>
+ <topic href="help/EGit/New_and_Noteworthy/3.5/3.5.html#Usability_Improvements" label="Usability Improvements"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/3.5/3.5.html#Performance_Improvements" label="Performance Improvements"></topic>
</topic>
- <topic href="help/EGit/New_and_Noteworthy/3.4/Bug-Fixes.html" label="Bug Fixes"></topic>
- <topic href="help/EGit/New_and_Noteworthy/3.4/Contributors.html" label="Contributors"></topic>
- <topic href="help/EGit/New_and_Noteworthy/3.4/Updating-This-Document.html" label="Updating This Document"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/3.5/Bug-Fixes.html" label="Bug Fixes"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/3.5/Contributors.html" label="Contributors"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/3.5/Updating-This-Document.html" label="Updating This Document"></topic>
</topic>
- <topic href="help/JGit/New_and_Noteworthy/3.4/3.4.html" label="JGit 3.4 New and Noteworthy">
- <topic href="help/JGit/New_and_Noteworthy/3.4/3.4.html" label="JGit">
- <topic href="help/JGit/New_and_Noteworthy/3.4/3.4.html#Features" label="Features"></topic>
- <topic href="help/JGit/New_and_Noteworthy/3.4/3.4.html#Command_Line" label="Command Line"></topic>
- <topic href="help/JGit/New_and_Noteworthy/3.4/3.4.html#Performance_Improvements" label="Performance Improvements"></topic>
- <topic href="help/JGit/New_and_Noteworthy/3.4/3.4.html#Build_and_Release_Engineering" label="Build and Release Engineering"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/3.5/3.5.html" label="JGit 3.5 New and Noteworthy">
+ <topic href="help/JGit/New_and_Noteworthy/3.5/3.5.html" label="JGit">
+ <topic href="help/JGit/New_and_Noteworthy/3.5/3.5.html#Features" label="Features"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/3.5/3.5.html#Command_Line" label="Command Line"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/3.5/3.5.html#Performance_Improvements" label="Performance Improvements"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/3.5/3.5.html#Build_and_Release_Engineering" label="Build and Release Engineering"></topic>
</topic>
- <topic href="help/JGit/New_and_Noteworthy/3.4/Bug-Fixes.html" label="Bug Fixes"></topic>
- <topic href="help/JGit/New_and_Noteworthy/3.4/Contributors.html" label="Contributors"></topic>
- <topic href="help/JGit/New_and_Noteworthy/3.4/Updating-This-Document.html" label="Updating This Document"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/3.5/Bug-Fixes.html" label="Bug Fixes"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/3.5/Contributors.html" label="Contributors"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/3.5/Updating-This-Document.html" label="Updating This Document"></topic>
</topic>
<topic href="help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html" label="Git for Eclipse Users">
<topic href="help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html" label="Centralised version control systems"></topic>
@@ -469,4 +478,103 @@
<topic href="help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html#Rebasing_and_fast-forwarding" label="Rebasing and fast-forwarding"></topic>
<topic href="help/EGit/Git_For_Eclipse_Users/Updating-This-Document.html" label="Updating This Document"></topic>
</topic>
+ <topic href="help/EGit/Contributor_Guide/Contributor-Guide.html" label="EGit Contributor Guide">
+ <topic href="help/EGit/Contributor_Guide/Contributor-Guide.html" label="Communication"></topic>
+ <topic href="help/EGit/Contributor_Guide/Obtaining-Sources.html" label="Obtaining Sources">
+ <topic href="help/EGit/Contributor_Guide/Obtaining-Sources.html#Cloning" label="Cloning">
+ <topic href="help/EGit/Contributor_Guide/Obtaining-Sources.html#On_the_command_line" label="On the command line"></topic>
+ <topic href="help/EGit/Contributor_Guide/Obtaining-Sources.html#Using_EGit_.28see_.5Bhttp:.2F.2Fwww.eclipse.org.2Fegit.2Fdownload.2F_download_page.5D.29" label="Using EGit (see [http://www.eclipse.org/egit/download/ download page])"></topic>
+ </topic>
+ <topic href="help/EGit/Contributor_Guide/Obtaining-Sources.html#Repositories" label="Repositories">
+ <topic href="help/EGit/Contributor_Guide/Obtaining-Sources.html#EGit" label="EGit"></topic>
+ <topic href="help/EGit/Contributor_Guide/Obtaining-Sources.html#JGit" label="JGit"></topic>
+ <topic href="help/EGit/Contributor_Guide/Obtaining-Sources.html#EGit_GitHub_Integration" label="EGit GitHub Integration"></topic>
+ <topic href="help/EGit/Contributor_Guide/Obtaining-Sources.html#EGit_PDE_Tools" label="EGit PDE Tools"></topic>
+ </topic>
+ </topic>
+ <topic href="help/EGit/Contributor_Guide/Development-IDE-Configuration.html" label="Development IDE Configuration">
+ <topic href="help/EGit/Contributor_Guide/Development-IDE-Configuration.html#Tools" label="Tools"></topic>
+ <topic href="help/EGit/Contributor_Guide/Development-IDE-Configuration.html#Java_Requirements" label="Java Requirements"></topic>
+ <topic href="help/EGit/Contributor_Guide/Development-IDE-Configuration.html#Dependencies" label="Dependencies">
+ <topic href="help/EGit/Contributor_Guide/Development-IDE-Configuration.html#Option_1:_Use_a_Target_Platform" label="Option 1: Use a Target Platform"></topic>
+ <topic href="help/EGit/Contributor_Guide/Development-IDE-Configuration.html#Option_2:_Install_from_Orbit_P2_Repository" label="Option 2: Install from Orbit P2 Repository"></topic>
+ </topic>
+ <topic href="help/EGit/Contributor_Guide/Development-IDE-Configuration.html#Running" label="Running"></topic>
+ </topic>
+ <topic href="help/EGit/Contributor_Guide/Builds.html" label="Builds">
+ <topic href="help/EGit/Contributor_Guide/Builds.html#JGit_2" label="JGit"></topic>
+ <topic href="help/EGit/Contributor_Guide/Builds.html#EGit_2" label="EGit"></topic>
+ <topic href="help/EGit/Contributor_Guide/Builds.html#Mailing_Lists" label="Mailing Lists"></topic>
+ <topic href="help/EGit/Contributor_Guide/Builds.html#Maven_Build_Sequence" label="Maven Build Sequence"></topic>
+ <topic href="help/EGit/Contributor_Guide/Builds.html#FindBugs_and_PMD" label="FindBugs and PMD"></topic>
+ <topic href="help/EGit/Contributor_Guide/Builds.html#Checking_for_JGit_API_Changes_using_API_Baseline" label="Checking for JGit API Changes using API Baseline"></topic>
+ <topic href="help/EGit/Contributor_Guide/Builds.html#Automated_Signing_and_Publishing" label="Automated Signing and Publishing">
+ <topic href="help/EGit/Contributor_Guide/Builds.html#Signing_.28old_method.2C_replaced_by_automated_procedure.29" label="Signing (old method, replaced by automated procedure)"></topic>
+ </topic>
+ <topic href="help/EGit/Contributor_Guide/Builds.html#Contribution_to_Release_Train" label="Contribution to Release Train"></topic>
+ </topic>
+ <topic href="help/EGit/Contributor_Guide/Documentation.html" label="Documentation"></topic>
+ <topic href="help/EGit/Contributor_Guide/Tests.html" label="Tests">
+ <topic href="help/EGit/Contributor_Guide/Tests.html#JGit_Unit_Tests" label="JGit Unit Tests"></topic>
+ <topic href="help/EGit/Contributor_Guide/Tests.html#JGit_HTTP_Tests" label="JGit HTTP Tests"></topic>
+ <topic href="help/EGit/Contributor_Guide/Tests.html#EGit_Core_Tests" label="EGit Core Tests"></topic>
+ <topic href="help/EGit/Contributor_Guide/Tests.html#EGit_UI_Tests" label="EGit UI Tests">
+ <topic href="help/EGit/Contributor_Guide/Tests.html#During_Maven_Build" label="During Maven Build"></topic>
+ </topic>
+ <topic href="help/EGit/Contributor_Guide/Tests.html#Auxilary_testing_tools" label="Auxilary testing tools"></topic>
+ </topic>
+ <topic href="help/EGit/Contributor_Guide/Bugs.html" label="Bugs">
+ <topic href="help/EGit/Contributor_Guide/Bugs.html#Links" label="Links">
+ <topic href="help/EGit/Contributor_Guide/Bugs.html#Filing_Bugs" label="Filing Bugs"></topic>
+ <topic href="help/EGit/Contributor_Guide/Bugs.html#Bug_Reports_and_Links" label="Bug Reports and Links"></topic>
+ </topic>
+ <topic href="help/EGit/Contributor_Guide/Bugs.html#Keywords" label="Keywords"></topic>
+ </topic>
+ <topic href="help/EGit/Contributor_Guide/Website.html" label="Website"></topic>
+ <topic href="help/EGit/Contributor_Guide/Contributing-Patches.html" label="Contributing Patches">
+ <topic href="help/EGit/Contributor_Guide/Contributing-Patches.html#Using_Gerrit_at_Eclipse" label="Using Gerrit at Eclipse">
+ <topic href="help/EGit/Contributor_Guide/Contributing-Patches.html#User_Account" label="User Account"></topic>
+ <topic href="help/EGit/Contributor_Guide/Contributing-Patches.html#Legal_Paperwork" label="Legal Paperwork"></topic>
+ <topic href="help/EGit/Contributor_Guide/Contributing-Patches.html#Logon" label="Logon">
+ <topic href="help/EGit/Contributor_Guide/Contributing-Patches.html#Gerrit_Web_UI" label="Gerrit Web UI"></topic>
+ <topic href="help/EGit/Contributor_Guide/Contributing-Patches.html#Git_over_SSH" label="Git over SSH"></topic>
+ <topic href="help/EGit/Contributor_Guide/Contributing-Patches.html#Git_over_HTTPS" label="Git over HTTPS"></topic>
+ </topic>
+ <topic href="help/EGit/Contributor_Guide/Contributing-Patches.html#SSH_Keys" label="SSH Keys"></topic>
+ <topic href="help/EGit/Contributor_Guide/Contributing-Patches.html#Doing_Code_Reviews_with_Gerrit" label="Doing Code Reviews with Gerrit"></topic>
+ <topic href="help/EGit/Contributor_Guide/Contributing-Patches.html#Using_Gerrit_with_git_command_line:" label="Using Gerrit with git command line:">
+ <topic href="help/EGit/Contributor_Guide/Contributing-Patches.html#Adding_a_dedicated_remote" label="Adding a dedicated remote"></topic>
+ </topic>
+ <topic href="help/EGit/Contributor_Guide/Contributing-Patches.html#Using_Gerrit_with_EGit:" label="Using Gerrit with EGit:"></topic>
+ <topic href="help/EGit/Contributor_Guide/Contributing-Patches.html#Using_the_Mylyn_Gerrit_Connector" label="Using the Mylyn Gerrit Connector"></topic>
+ </topic>
+ <topic href="help/EGit/Contributor_Guide/Contributing-Patches.html#Granularity_of_Changes" label="Granularity of Changes">
+ <topic href="help/EGit/Contributor_Guide/Contributing-Patches.html#Branches" label="Branches"></topic>
+ </topic>
+ <topic href="help/EGit/Contributor_Guide/Contributing-Patches.html#Coding_standards" label="Coding standards">
+ <topic href="help/EGit/Contributor_Guide/Contributing-Patches.html#Braces_for_one-line_statements" label="Braces for one-line statements"></topic>
+ <topic href="help/EGit/Contributor_Guide/Contributing-Patches.html#Removing_trailing_whitespace" label="Removing trailing whitespace"></topic>
+ </topic>
+ <topic href="help/EGit/Contributor_Guide/Contributing-Patches.html#Commit_message_guidelines" label="Commit message guidelines"></topic>
+ <topic href="help/EGit/Contributor_Guide/Contributing-Patches.html#Copyright" label="Copyright"></topic>
+ <topic href="help/EGit/Contributor_Guide/Contributing-Patches.html#Test_before_submitting" label="Test before submitting"></topic>
+ <topic href="help/EGit/Contributor_Guide/Contributing-Patches.html#Sending_patches_by_mail" label="Sending patches by mail"></topic>
+ </topic>
+ <topic href="help/EGit/Contributor_Guide/Gerrit-Code-Review-Cheatsheet.html" label="Gerrit Code Review Cheatsheet">
+ <topic href="help/EGit/Contributor_Guide/Gerrit-Code-Review-Cheatsheet.html#Install_the_commit-msg_hook_in_your_repository" label="Install the commit-msg hook in your repository"></topic>
+ <topic href="help/EGit/Contributor_Guide/Gerrit-Code-Review-Cheatsheet.html#To_create_a_new_change" label="To create a new change"></topic>
+ <topic href="help/EGit/Contributor_Guide/Gerrit-Code-Review-Cheatsheet.html#To_update_an_existing_change_with_a_new_commit" label="To update an existing change with a new commit"></topic>
+ <topic href="help/EGit/Contributor_Guide/Gerrit-Code-Review-Cheatsheet.html#To_compare_bulk_diffs_using_Git" label="To compare bulk diffs using Git"></topic>
+ <topic href="help/EGit/Contributor_Guide/Gerrit-Code-Review-Cheatsheet.html#To_trigger_Hudson_build_for_a_change" label="To trigger Hudson build for a change"></topic>
+ <topic href="help/EGit/Contributor_Guide/Gerrit-Code-Review-Cheatsheet.html#To_approve_a_change" label="To approve a change"></topic>
+ <topic href="help/EGit/Contributor_Guide/Gerrit-Code-Review-Cheatsheet.html#To_add_a_reviewer" label="To add a reviewer"></topic>
+ <topic href="help/EGit/Contributor_Guide/Gerrit-Code-Review-Cheatsheet.html#Code_Review" label="Code Review"></topic>
+ <topic href="help/EGit/Contributor_Guide/Gerrit-Code-Review-Cheatsheet.html#IP_Review" label="IP Review"></topic>
+ <topic href="help/EGit/Contributor_Guide/Gerrit-Code-Review-Cheatsheet.html#Submission_Guidelines" label="Submission Guidelines"></topic>
+ <topic href="help/EGit/Contributor_Guide/Gerrit-Code-Review-Cheatsheet.html#Tips_.26_Tricks" label="Tips &amp; Tricks">
+ <topic href="help/EGit/Contributor_Guide/Gerrit-Code-Review-Cheatsheet.html#Class_Loading_Issues" label="Class Loading Issues"></topic>
+ </topic>
+ </topic>
+ <topic href="help/EGit/Contributor_Guide/Updating-This-Document.html" label="Updating This Document"></topic>
+ </topic>
</toc> \ No newline at end of file
diff --git a/org.eclipse.egit.target/pom.xml b/org.eclipse.egit.target/pom.xml
index 2916bc8e0..a16950a91 100644
--- a/org.eclipse.egit.target/pom.xml
+++ b/org.eclipse.egit.target/pom.xml
@@ -47,4 +47,4 @@
</plugin>
</plugins>
</build>
-</project> \ No newline at end of file
+</project>
diff --git a/org.eclipse.egit.ui/icons/obj16/fixup-down.png b/org.eclipse.egit.ui/icons/obj16/fixup-down.png
new file mode 100644
index 000000000..6a2a080ca
--- /dev/null
+++ b/org.eclipse.egit.ui/icons/obj16/fixup-down.png
Binary files differ
diff --git a/org.eclipse.egit.ui/icons/obj16/fixup-up.png b/org.eclipse.egit.ui/icons/obj16/fixup-up.png
new file mode 100644
index 000000000..f90351902
--- /dev/null
+++ b/org.eclipse.egit.ui/icons/obj16/fixup-up.png
Binary files differ
diff --git a/org.eclipse.egit.ui/icons/obj16/fixup.gif b/org.eclipse.egit.ui/icons/obj16/fixup.gif
deleted file mode 100644
index 2b9905f62..000000000
--- a/org.eclipse.egit.ui/icons/obj16/fixup.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.ui/icons/obj16/squash-down.png b/org.eclipse.egit.ui/icons/obj16/squash-down.png
new file mode 100644
index 000000000..8ea59cc1c
--- /dev/null
+++ b/org.eclipse.egit.ui/icons/obj16/squash-down.png
Binary files differ
diff --git a/org.eclipse.egit.ui/icons/obj16/squash-up.png b/org.eclipse.egit.ui/icons/obj16/squash-up.png
new file mode 100644
index 000000000..e1ff226fc
--- /dev/null
+++ b/org.eclipse.egit.ui/icons/obj16/squash-up.png
Binary files differ
diff --git a/org.eclipse.egit.ui/icons/obj16/squash.gif b/org.eclipse.egit.ui/icons/obj16/squash.gif
deleted file mode 100644
index 816540603..000000000
--- a/org.eclipse.egit.ui/icons/obj16/squash.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.ui/plugin.properties b/org.eclipse.egit.ui/plugin.properties
index 03b8d6eff..766bddcac 100644
--- a/org.eclipse.egit.ui/plugin.properties
+++ b/org.eclipse.egit.ui/plugin.properties
@@ -279,6 +279,7 @@ RepoViewPullCommand.name = Pull
TeamPullCommand.name = Pull
PullIntoCurrentBranch.tooltip = Pull changes from upstream into current branch
RemoteSubMenu.label = R&emote
+RepositorySubMenu.label = &Repository
PushToUpstreamAction.label = &Push to Upstream
PushToUpstreamAction.tooltip = Push current branch to upstream if configured or start push branch wizard
FetchFromUpstreamAction.label = &Fetch from Upstream
@@ -286,7 +287,6 @@ CompareWithBranchOrTagAction.label = &Branch, Tag, or Reference...
MergeToolAction.label = &Merge Tool
CompareWithCommitAction.label = &Commit...
CreatePatchAction.label = Crea&te Patch...
-CreatePatchAction.tooltip = Compare your working directory contents with the index and generate a diff file that can be used as a patch file.
TreeCompareView.name = Git Tree Compare
TeamMenu.label = T&eam
RebaseCommand.label = Rebase on
diff --git a/org.eclipse.egit.ui/plugin.xml b/org.eclipse.egit.ui/plugin.xml
index a6db70c30..4d3ee37b7 100644
--- a/org.eclipse.egit.ui/plugin.xml
+++ b/org.eclipse.egit.ui/plugin.xml
@@ -137,26 +137,10 @@
enablesFor="*"
id="org.eclipse.egit.ui.internal.actions.applyPatch"
label="%ApplyPatchAction_label"
- menubarPath="team.main/group6"
+ menubarPath="team.main/applyPatchGroup"
overrideActionId="org.eclipse.team.ui.applyPatch">
</action>
<action
- class="org.eclipse.egit.ui.internal.actions.ShowHistoryAction"
- definitionId="org.eclipse.egit.ui.team.ShowHistory"
- icon="icons/obj16/history.gif"
- id="org.eclipse.egit.ui.internal.actions.ShowHistoryActionHandler"
- label="%ShowResourceInHistoryAction_label"
- menubarPath="team.main/group9">
- </action>
- <action
- class="org.eclipse.egit.ui.internal.actions.ShowRepositoriesViewAction"
- definitionId="org.eclipse.egit.ui.team.ShowRepositoriesView"
- icon="icons/eview16/repo_rep.gif"
- id="org.eclipse.egit.ui.internal.actions.ShowRepositoriesViewAction"
- label="%ShowRepositoryAction_label"
- menubarPath="team.main/group9">
- </action>
- <action
class="org.eclipse.egit.ui.internal.actions.MergeToolAction"
definitionId="org.eclipse.egit.ui.team.MergeTool"
icon="icons/obj16/mergetool.gif"
@@ -164,13 +148,6 @@
label="%MergeToolAction.label"
menubarPath="team.main/group4">
</action>
- <action
- class="org.eclipse.egit.ui.internal.actions.CreatePatchAction"
- id="org.eclipse.egit.ui.internal.actions.CreatePatchAction"
- label="%CreatePatchAction.label"
- menubarPath="team.main/group6"
- tooltip="%CreatePatchAction.tooltip">
- </action>
</objectContribution>
<objectContribution
adaptable="true"
@@ -187,7 +164,7 @@
definitionId="org.eclipse.egit.ui.team.ShowBlame"
label="%ShowBlameAction_label"
icon="icons/etool16/annotate.gif"
- menubarPath="team.main/group9">
+ menubarPath="team.main/showAnnotationsGroup">
</action>
</objectContribution>
</extension>
@@ -1215,7 +1192,7 @@
</class>
<activeWhen>
<or>
- <test property="GitSelection.projectSingleRepository">
+ <test property="GitSelection.resourcesSingleRepository">
</test>
<and>
<count
@@ -1562,16 +1539,9 @@
class="org.eclipse.egit.ui.internal.actions.ShowHistoryActionHandler">
</class>
<activeWhen>
- <and>
- <count
- value="1">
- </count>
- <iterate>
- <adapt
- type="org.eclipse.core.resources.IResource">
- </adapt>
- </iterate>
- </and>
+ <test
+ property="GitSelection.resourcesSingleRepository">
+ </test>
</activeWhen>
</handler>
<handler
@@ -1876,14 +1846,9 @@
class="org.eclipse.egit.ui.internal.actions.UntrackActionHandler"
commandId="org.eclipse.egit.ui.team.Untrack">
<activeWhen>
- <iterate>
- <adapt type="org.eclipse.core.resources.IResource">
- <test
- property="org.eclipse.core.resources.projectPersistentProperty"
- args="org.eclipse.team.core.repository, org.eclipse.egit.core.GitProvider">
- </test>
- </adapt>
- </iterate>
+ <test
+ property="GitSelection.resourcesSingleRepository">
+ </test>
</activeWhen>
</handler>
<handler
@@ -3910,6 +3875,74 @@
name="org.eclipse.egit.ui.AdvancedSeparator">
</separator>
<menu
+ label="%RepositorySubMenu.label">
+ <visibleWhen
+ checkEnabled="false">
+ <test
+ property="GitSelection.fileOrFolderInRepository">
+ </test>
+ </visibleWhen>
+ <separator
+ name="group1"
+ visible="true">
+ </separator>
+ <command
+ commandId="org.eclipse.egit.ui.team.SimplePush"
+ label="%PushToUpstreamAction.label"
+ style="push">
+ </command>
+ <command
+ commandId="org.eclipse.egit.ui.team.SimpleFetch"
+ label="%FetchFromUpstreamAction.label"
+ style="push">
+ </command>
+ <dynamic
+ class="org.eclipse.egit.ui.internal.actions.PushMenu"
+ id="org.eclipse.egit.ui.team.popup.Push">
+ </dynamic>
+ <command
+ commandId="org.eclipse.egit.ui.team.Pull"
+ label="%RepoViewPullMenu.label"
+ style="push">
+ </command>
+ <command
+ commandId="org.eclipse.egit.ui.PushHeadToGerrit"
+ label="%PushToGerritMenu.label"
+ style="push">
+ <visibleWhen
+ checkEnabled="false">
+ <test
+ property="GitSelection.fileOrFolderInRepository"
+ args="hasGerritConfiguration">
+ </test>
+ </visibleWhen>
+ </command>
+ <command
+ commandId="org.eclipse.egit.ui.FetchGerritChange"
+ label="%FetchFromGerritCommand.label"
+ style="push">
+ <visibleWhen
+ checkEnabled="false">
+ <test
+ property="GitSelection.fileOrFolderInRepository"
+ args="hasGerritConfiguration">
+ </test>
+ </visibleWhen>
+ </command>
+ <separator
+ name="group2"
+ visible="true">
+ </separator>
+ <menu
+ label="%SwitchToMenu.label"
+ icon="icons/obj16/branches_obj.gif">
+ <dynamic
+ class="org.eclipse.egit.ui.internal.actions.SwitchToMenu"
+ id="org.eclipse.egit.ui.switchToMenu">
+ </dynamic>
+ </menu>
+ </menu>
+ <menu
label="%AdvancedMenu.label">
<command
commandId="org.eclipse.egit.ui.team.RenameBranch"
@@ -3999,19 +4032,9 @@
style="push">
<visibleWhen
checkEnabled="false">
- <and>
- <count
- value="+">
- </count>
- <iterate>
- <adapt
- type="org.eclipse.core.resources.IResource">
- <test
- property="GitResource.isShared">
- </test>
- </adapt>
- </iterate>
- </and>
+ <test
+ property="GitSelection.resourcesSingleRepository">
+ </test>
</visibleWhen>
</command>
<command
@@ -4020,19 +4043,9 @@
style="push">
<visibleWhen
checkEnabled="false">
- <and>
- <count
- value="+">
- </count>
- <iterate>
- <adapt
- type="org.eclipse.core.resources.IResource">
- <test
- property="GitResource.isShared">
- </test>
- </adapt>
- </iterate>
- </and>
+ <test
+ property="GitSelection.resourcesSingleRepository">
+ </test>
</visibleWhen>
</command>
<command
@@ -4040,27 +4053,15 @@
icon="$nl$/icons/obj16/untrack.gif"
label="%UntrackAction_label"
style="push">
- <visibleWhen checkEnabled="false">
- <and>
- <count value="+" />
- <iterate>
- <and>
- <adapt type="org.eclipse.core.resources.IResource">
- <and>
- <test property="GitResource.isShared" />
- </and>
- </adapt>
- </and>
- </iterate>
- </and>
- </visibleWhen>
+ <visibleWhen
+ checkEnabled="false">
+ <test
+ property="GitSelection.resourcesSingleRepository">
+ </test>
+ </visibleWhen>
</command>
</menu>
<separator
- name="applyPatchGroup"
- visible="false">
- </separator>
- <separator
name="group2"
visible="true">
</separator>
@@ -4160,6 +4161,21 @@
name="group6"
visible="true">
</separator>
+ <command
+ commandId="org.eclipse.egit.ui.team.CreatePatch"
+ label="%CreatePatchAction.label"
+ style="push">
+ <visibleWhen
+ checkEnabled="false">
+ <test
+ property="GitSelection.resourcesSingleRepository">
+ </test>
+ </visibleWhen>
+ </command>
+ <separator
+ name="applyPatchGroup"
+ visible="false">
+ </separator>
<separator
name="group7"
visible="true">
@@ -4172,6 +4188,32 @@
name="group9"
visible="true">
</separator>
+ <command
+ commandId="org.eclipse.egit.ui.team.ShowHistory"
+ label="%ShowResourceInHistoryAction_label"
+ style="push">
+ <visibleWhen
+ checkEnabled="false">
+ <test
+ property="GitSelection.resourcesSingleRepository">
+ </test>
+ </visibleWhen>
+ </command>
+ <command
+ commandId="org.eclipse.egit.ui.team.ShowRepositoriesView"
+ label="%ShowRepositoryAction_label"
+ style="push">
+ <visibleWhen
+ checkEnabled="false">
+ <test
+ property="GitSelection.resourcesSingleRepository">
+ </test>
+ </visibleWhen>
+ </command>
+ <separator
+ name="showAnnotationsGroup"
+ visible="false">
+ </separator>
<separator
name="group10"
visible="true">
@@ -4199,20 +4241,6 @@
</test>
</visibleWhen>
</command>
- <menu
- label="Repository">
- <visibleWhen
- checkEnabled="false">
- <test
- property="Foo.bar">
- </test>
- </visibleWhen>
- <command
- commandId="org.eclipse.egit.ui.team.SimplePush"
- label="%PushToUpstreamAction.label"
- style="push">
- </command>
- </menu>
</menu>
</menuContribution>
<menuContribution
@@ -4818,7 +4846,7 @@
class="org.eclipse.egit.ui.internal.selection.SelectionPropertyTester"
id="org.eclipse.egit.ui.SelectionTester"
namespace="GitSelection"
- properties="projectSingleRepository,projectsWithRepositories,resourcesSingleRepository"
+ properties="projectSingleRepository,projectsWithRepositories,resourcesSingleRepository,fileOrFolderInRepository"
type="java.util.Collection">
</propertyTester>
</extension>
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIIcons.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIIcons.java
index a949dea2a..0bbea32be 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIIcons.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIIcons.java
@@ -252,11 +252,17 @@ public class UIIcons {
/** Compact tree presentation icon */
public final static ImageDescriptor COMPACT;
- /** Squash icon */
- public final static ImageDescriptor SQUASH;
+ /** Squash icon arrow up */
+ public final static ImageDescriptor SQUASH_UP;
- /** Fixup icon */
- public final static ImageDescriptor FIXUP;
+ /** Squash icon arrow down */
+ public final static ImageDescriptor SQUASH_DOWN;
+
+ /** Fixup icon arrow up */
+ public final static ImageDescriptor FIXUP_UP;
+
+ /** Fixup icon arrow down */
+ public final static ImageDescriptor FIXUP_DOWN;
/** Reword icon */
public final static ImageDescriptor REWORD;
@@ -354,8 +360,10 @@ public class UIIcons {
HIERARCHY = map("elcl16/hierarchicalLayout.gif"); //$NON-NLS-1$
FLAT = map("elcl16/flatLayout.gif"); //$NON-NLS-1$
COMPACT = map("elcl16/compactLayout.gif"); //$NON-NLS-1$
- SQUASH = map("obj16/squash.gif"); //$NON-NLS-1$
- FIXUP = map("obj16/fixup.gif"); //$NON-NLS-1$
+ SQUASH_UP = map("obj16/squash-up.png"); //$NON-NLS-1$
+ SQUASH_DOWN = map("obj16/squash-down.png"); //$NON-NLS-1$
+ FIXUP_UP = map("obj16/fixup-up.png"); //$NON-NLS-1$
+ FIXUP_DOWN = map("obj16/fixup-down.png"); //$NON-NLS-1$
REWORD = map("obj16/reword.gif"); //$NON-NLS-1$
DONE_STEP = map("obj16/done_step.gif"); //$NON-NLS-1$
CURRENT_STEP = map("obj16/current_step.gif"); //$NON-NLS-1$
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ActionCommands.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ActionCommands.java
index fd7232736..fb5ff006b 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ActionCommands.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ActionCommands.java
@@ -110,12 +110,6 @@ public class ActionCommands {
/** "Rebase" action command id */
public static final String REBASE_ACTION = "org.eclipse.egit.ui.team.Rebase"; //$NON-NLS-1$
- /** "Show History" action command id */
- public static final String SHOW_HISTORY = "org.eclipse.egit.ui.team.ShowHistory"; //$NON-NLS-1$
-
- /** "Show Repository View" action command id */
- public static final String SHOW_REPO_VIEW = "org.eclipse.egit.ui.team.ShowRepositoriesView"; //$NON-NLS-1$
-
/** "Stash Changes" action command id */
public static final String STASH_CREATE = "org.eclipse.egit.ui.team.stash.create"; //$NON-NLS-1$
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/CreatePatchAction.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/CreatePatchAction.java
deleted file mode 100644
index 2b214b724..000000000
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/CreatePatchAction.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2011, Tomasz Zarna <Tomasz.Zarna@pl.ibm.com>
- *
- * 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
- *******************************************************************************/
-package org.eclipse.egit.ui.internal.actions;
-
-/**
- * Action to generate a patch file using the diff command.
- */
-public class CreatePatchAction extends RepositoryAction {
-
- /**
- *
- */
- public CreatePatchAction() {
- super(ActionCommands.CREATE_PATCH, new CreatePatchActionHandler());
- }
-} \ No newline at end of file
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ShowHistoryAction.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ShowHistoryAction.java
deleted file mode 100644
index 4a8535b91..000000000
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ShowHistoryAction.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2010, Mathias Kinzler <mathias.kinzler@sap.com>
- *
- * 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
- *******************************************************************************/
-package org.eclipse.egit.ui.internal.actions;
-
-
-/**
- * An action to show the history for a resource.
- */
-public class ShowHistoryAction extends RepositoryAction {
- /**
- *
- */
- public ShowHistoryAction() {
- super(ActionCommands.SHOW_HISTORY, new ShowHistoryActionHandler());
- }
-}
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ShowRepositoriesViewAction.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ShowRepositoriesViewAction.java
deleted file mode 100644
index c328e7f17..000000000
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ShowRepositoriesViewAction.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2010, Mathias Kinzler <mathias.kinzler@sap.com>
- *
- * 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
- *******************************************************************************/
-package org.eclipse.egit.ui.internal.actions;
-
-/**
- * An action to show the repositories view for a resource.
- */
-public class ShowRepositoriesViewAction extends RepositoryAction {
- /**
- *
- */
- public ShowRepositoriesViewAction() {
- super(ActionCommands.SHOW_REPO_VIEW, new ShowRepositoriesViewActionHandler());
- }
-}
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitSelectDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitSelectDialog.java
index 0ad5d88f4..6c6c87512 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitSelectDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitSelectDialog.java
@@ -84,7 +84,6 @@ public class CommitSelectDialog extends TitleAreaDialog {
c3.setText(UIText.CommitSelectDialog_DateColumn);
tv.setInput(commits);
table.setHeaderVisible(true);
- table.setLinesVisible(true);
tv.addSelectionChangedListener(new ISelectionChangedListener() {
public void selectionChanged(SelectionChangedEvent event) {
if (!event.getSelection().isEmpty())
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultTable.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultTable.java
index 22c9a2ceb..a7893e363 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultTable.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultTable.java
@@ -329,7 +329,6 @@ class FetchResultTable {
ColumnViewerToolTipSupport.enableFor(treeViewer);
final Tree tree = treeViewer.getTree();
GridDataFactory.fillDefaults().grab(true, true).applyTo(tree);
- tree.setLinesVisible(true);
treePanel.addDisposeListener(new DisposeListener() {
public void widgetDisposed(DisposeEvent e) {
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GitCreatePatchWizard.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GitCreatePatchWizard.java
index 6757c5eb1..5f6218a99 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GitCreatePatchWizard.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GitCreatePatchWizard.java
@@ -222,13 +222,15 @@ public class GitCreatePatchWizard extends Wizard {
final List<PathFilter> filters = new ArrayList<PathFilter>();
for (IResource r : rs) {
RepositoryMapping rm = RepositoryMapping.getMapping(r);
- String repoRelativePath = rm.getRepoRelativePath(r);
- if (repoRelativePath != null)
- if (repoRelativePath.equals("")) //$NON-NLS-1$
- // repository selected
- return TreeFilter.ALL;
- else
- filters.add(PathFilter.create(repoRelativePath));
+ if (rm != null) {
+ String repoRelativePath = rm.getRepoRelativePath(r);
+ if (repoRelativePath != null)
+ if (repoRelativePath.equals("")) //$NON-NLS-1$
+ // repository selected
+ return TreeFilter.ALL;
+ else
+ filters.add(PathFilter.create(repoRelativePath));
+ }
}
if (filters.size() == 0)
return null;
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/MergeResultDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/MergeResultDialog.java
index 953be96c4..9a79b737a 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/MergeResultDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/MergeResultDialog.java
@@ -53,7 +53,6 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.OpenAndLinkWithEditorHelper;
import org.eclipse.ui.model.WorkbenchLabelProvider;
@@ -187,8 +186,6 @@ public class MergeResultDialog extends Dialog {
return getCommits(mergeResult.getMergedCommits());
}
});
- Table table = viewer.getTable();
- table.setLinesVisible(true);
final IStyledLabelProvider styleProvider = new IStyledLabelProvider() {
private final WorkbenchLabelProvider wrapped = new WorkbenchLabelProvider();
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushResultTable.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushResultTable.java
index 48b545fbb..9dbb97de5 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushResultTable.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushResultTable.java
@@ -84,7 +84,6 @@ class PushResultTable {
ColumnViewerToolTipSupport.enableFor(treeViewer);
final Tree table = treeViewer.getTree();
GridDataFactory.fillDefaults().grab(true, true).applyTo(table);
- table.setLinesVisible(true);
deleteImage = UIIcons.ELCL16_DELETE.createImage();
UIUtils.hookDisposal(root, deleteImage);
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveStepActionToolBarProvider.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveStepActionToolBarProvider.java
index 611d7d7f7..58379c521 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveStepActionToolBarProvider.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveStepActionToolBarProvider.java
@@ -122,7 +122,7 @@ public class RebaseInteractiveStepActionToolBarProvider {
rebaseActionItems[2] = itemEdit;
itemSquash = new ToolItem(theToolbar, SWT.RADIO);
- itemSquash.setImage(getImage(UIIcons.SQUASH));
+ itemSquash.setImage(getImage(UIIcons.SQUASH_UP));
itemSquash.addSelectionListener(new ActionSelectionListener(
RebaseInteractivePlan.ElementAction.SQUASH));
itemSquash
@@ -130,7 +130,7 @@ public class RebaseInteractiveStepActionToolBarProvider {
rebaseActionItems[3] = itemSquash;
itemFixup = new ToolItem(theToolbar, SWT.RADIO);
- itemFixup.setImage(getImage(UIIcons.FIXUP));
+ itemFixup.setImage(getImage(UIIcons.FIXUP_UP));
itemFixup.addSelectionListener(new ActionSelectionListener(
RebaseInteractivePlan.ElementAction.FIXUP));
itemFixup
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveView.java
index c890a9c36..d8c8b3a07 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveView.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveView.java
@@ -588,8 +588,8 @@ public class RebaseInteractiveView extends ViewPart implements
}
});
- boolean orderReversed = RebaseInteractivePreferences.isOrderReversed();
- int direction = (orderReversed ? SWT.DOWN : SWT.UP);
+ int direction = (RebaseInteractivePreferences.isOrderReversed() ? SWT.DOWN
+ : SWT.UP);
Tree planTree = planTreeViewer.getTree();
planTree.setSortColumn(stepColumn.getColumn());
@@ -606,7 +606,12 @@ public class RebaseInteractiveView extends ViewPart implements
case EDIT:
return UIIcons.getImage(resources, UIIcons.EDITCONFIG);
case FIXUP:
- return UIIcons.getImage(resources, UIIcons.FIXUP);
+ if (RebaseInteractivePreferences.isOrderReversed())
+ return UIIcons.getImage(resources,
+ UIIcons.FIXUP_DOWN);
+ else
+ return UIIcons.getImage(resources,
+ UIIcons.FIXUP_UP);
case PICK:
return UIIcons.getImage(resources, UIIcons.CHERRY_PICK);
case REWORD:
@@ -614,7 +619,12 @@ public class RebaseInteractiveView extends ViewPart implements
case SKIP:
return UIIcons.getImage(resources, UIIcons.REBASE_SKIP);
case SQUASH:
- return UIIcons.getImage(resources, UIIcons.SQUASH);
+ if (RebaseInteractivePreferences.isOrderReversed())
+ return UIIcons.getImage(resources,
+ UIIcons.SQUASH_DOWN);
+ else
+ return UIIcons.getImage(resources,
+ UIIcons.SQUASH_UP);
default:
// fall through
}
@@ -871,11 +881,11 @@ public class RebaseInteractiveView extends ViewPart implements
planViewer, actionToolBarProvider));
contextMenuItems.add(new PlanContextMenuAction(
UIText.RebaseInteractiveStepActionToolBarProvider_SquashText,
- UIIcons.SQUASH, RebaseInteractivePlan.ElementAction.SQUASH,
+ UIIcons.SQUASH_UP, RebaseInteractivePlan.ElementAction.SQUASH,
planViewer, actionToolBarProvider));
contextMenuItems.add(new PlanContextMenuAction(
UIText.RebaseInteractiveStepActionToolBarProvider_FixupText,
- UIIcons.FIXUP, RebaseInteractivePlan.ElementAction.FIXUP,
+ UIIcons.FIXUP_UP, RebaseInteractivePlan.ElementAction.FIXUP,
planViewer, actionToolBarProvider));
contextMenuItems.add(new PlanContextMenuAction(
UIText.RebaseInteractiveStepActionToolBarProvider_RewordText,
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesView.java
index 51aa3e142..77847c553 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesView.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesView.java
@@ -65,6 +65,7 @@ import org.eclipse.egit.ui.internal.repository.tree.RepositoryTreeNodeType;
import org.eclipse.egit.ui.internal.repository.tree.StashedCommitNode;
import org.eclipse.egit.ui.internal.repository.tree.TagNode;
import org.eclipse.egit.ui.internal.repository.tree.WorkingDirNode;
+import org.eclipse.egit.ui.internal.selection.SelectionUtils;
import org.eclipse.egit.ui.internal.trace.GitTraceLocation;
import org.eclipse.jface.action.IMenuListener;
import org.eclipse.jface.action.IMenuManager;
@@ -756,6 +757,12 @@ public class RepositoriesView extends CommonNavigator implements IShowInSource,
showPaths(paths);
return true;
}
+
+ Repository repository = SelectionUtils.getRepository(ss);
+ if (repository != null) {
+ showRepository(repository);
+ return true;
+ }
}
if(context.getInput() instanceof IFileEditorInput) {
IFileEditorInput input = (IFileEditorInput) context.getInput();
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/selection/SelectionPropertyTester.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/selection/SelectionPropertyTester.java
index 78b078a4b..3527f524f 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/selection/SelectionPropertyTester.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/selection/SelectionPropertyTester.java
@@ -12,6 +12,8 @@ import java.util.ArrayList;
import java.util.Collection;
import org.eclipse.core.expressions.PropertyTester;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IAdaptable;
@@ -32,37 +34,21 @@ public class SelectionPropertyTester extends PropertyTester {
public boolean test(Object receiver, String property, Object[] args,
Object expectedValue) {
Collection<?> collection = (Collection<?>) receiver;
+ if (collection.isEmpty())
+ return false;
if ("projectSingleRepository".equals(property)) { //$NON-NLS-1$
if (collection.size() != 1)
return false;
Repository repository = getRepositoryOfProjects(collection, true);
- if (repository == null)
- return false;
-
- for (Object arg : args) {
- String s = (String) arg;
- if (!ResourcePropertyTester.testRepositoryState(repository, s))
- return false;
- }
- return true;
+ return testRepositoryProperties(repository, args);
} else if ("projectsWithRepositories".equals(property)) { //$NON-NLS-1$
Repository repository = getRepositoryOfProjects(collection, false);
return repository != null;
} else if ("resourcesSingleRepository".equals(property)) { //$NON-NLS-1$
- if (collection.isEmpty())
- return false;
-
- Object firstElement = collection.iterator().next();
- IStructuredSelection selection;
- if (collection.size() == 1 && firstElement instanceof ITextSelection) {
- selection = SelectionUtils.getStructuredSelection((ITextSelection) firstElement);
- } else {
- selection = new StructuredSelection(new ArrayList<Object>(
- collection));
- }
+ IStructuredSelection selection = getStructuredSelection(collection);
// It may seem like we could just use SelectionUtils.getRepository
// here. The problem: It would also return a repository for a node
@@ -70,11 +56,51 @@ public class SelectionPropertyTester extends PropertyTester {
IResource[] resources = SelectionUtils
.getSelectedResources(selection);
Repository repository = getRepositoryOfResources(resources);
- return repository != null;
+ return testRepositoryProperties(repository, args);
+
+ } else if ("fileOrFolderInRepository".equals(property)) { //$NON-NLS-1$
+ if (collection.size() != 1)
+ return false;
+
+ IStructuredSelection selection = getStructuredSelection(collection);
+ if (selection.size() != 1)
+ return false;
+
+ Object firstElement = selection.getFirstElement();
+ IResource resource = AdapterUtils.adapt(firstElement,
+ IResource.class);
+ if (resource instanceof IFile || resource instanceof IFolder) {
+ RepositoryMapping m = RepositoryMapping.getMapping(resource);
+ if (m != null)
+ return testRepositoryProperties(m.getRepository(), args);
+ }
}
return false;
}
+ private static IStructuredSelection getStructuredSelection(
+ Collection<?> collection) {
+ Object firstElement = collection.iterator().next();
+ if (collection.size() == 1 && firstElement instanceof ITextSelection)
+ return SelectionUtils
+ .getStructuredSelection((ITextSelection) firstElement);
+ else
+ return new StructuredSelection(new ArrayList<Object>(collection));
+ }
+
+ private static boolean testRepositoryProperties(Repository repository,
+ Object[] properties) {
+ if (repository == null)
+ return false;
+
+ for (Object arg : properties) {
+ String s = (String) arg;
+ if (!ResourcePropertyTester.testRepositoryState(repository, s))
+ return false;
+ }
+ return true;
+ }
+
/**
* @param collection
* the selected elements
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingEntry.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingEntry.java
index 97df83995..bd3e2ff57 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingEntry.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingEntry.java
@@ -35,27 +35,30 @@ public class StagingEntry implements IAdaptable, IProblemDecoratable, IDecoratab
* State of the node
*/
public static enum State {
- /** added to the index, not in the tree */
+ /** in index, not in HEAD */
ADDED(EnumSet.of(Action.UNSTAGE)),
- /** changed from tree to index */
+ /** changed in index compared to HEAD */
CHANGED(EnumSet.of(Action.REPLACE_WITH_HEAD_REVISION, Action.UNSTAGE)),
- /** removed from index, but in tree */
+ /** removed from index, but in HEAD */
REMOVED(EnumSet.of(Action.REPLACE_WITH_HEAD_REVISION, Action.UNSTAGE)),
- /** in index (unchanged), but not filesystem */
+ /** in index (unchanged), missing from working tree */
MISSING(EnumSet.of(Action.REPLACE_WITH_HEAD_REVISION, Action.STAGE)),
- /** in index (changed from tree to index), but not filesystem */
+ /** changed in index compared to HEAD, missing from working tree */
MISSING_AND_CHANGED(EnumSet.of(Action.REPLACE_WITH_FILE_IN_GIT_INDEX,
Action.REPLACE_WITH_HEAD_REVISION, Action.STAGE)),
- /** modified on disk relative to the index */
+ /** modified in working tree compared to index */
MODIFIED(EnumSet.of(Action.REPLACE_WITH_HEAD_REVISION, Action.STAGE)),
- /** partially staged, modified in workspace and in index */
- PARTIALLY_MODIFIED(EnumSet.of(Action.REPLACE_WITH_FILE_IN_GIT_INDEX, Action.REPLACE_WITH_HEAD_REVISION, Action.STAGE)),
+ /** modified in working tree compared to index, changed in index compared to HEAD */
+ MODIFIED_AND_CHANGED(EnumSet.of(Action.REPLACE_WITH_FILE_IN_GIT_INDEX, Action.REPLACE_WITH_HEAD_REVISION, Action.STAGE)),
+
+ /** modified in working tree compared to index, added in index (not in HEAD) */
+ MODIFIED_AND_ADDED(EnumSet.of(Action.REPLACE_WITH_FILE_IN_GIT_INDEX, Action.STAGE)),
/** not ignored, and not in the index */
UNTRACKED(EnumSet.of(Action.STAGE, Action.DELETE, Action.IGNORE)),
@@ -245,7 +248,8 @@ public class StagingEntry implements IAdaptable, IProblemDecoratable, IDecoratab
}
public boolean isDirty() {
- return state == State.MODIFIED || state == State.PARTIALLY_MODIFIED;
+ return state == State.MODIFIED || state == State.MODIFIED_AND_CHANGED
+ || state == State.MODIFIED_AND_ADDED;
}
public Staged staged() {
@@ -273,6 +277,11 @@ public class StagingEntry implements IAdaptable, IProblemDecoratable, IDecoratab
}
@Override
+ public String toString() {
+ return "StagingEntry[" + state + " " + path + "]"; //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
+ }
+
+ @Override
public int hashCode() {
final int prime = 31;
int result = 1;
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java
index 5a14adc3e..8ae007737 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java
@@ -1442,7 +1442,8 @@ public class StagingView extends ViewPart implements IShowInSource {
case MISSING:
case MISSING_AND_CHANGED:
case MODIFIED:
- case PARTIALLY_MODIFIED:
+ case MODIFIED_AND_CHANGED:
+ case MODIFIED_AND_ADDED:
case CONFLICTING:
case UNTRACKED:
default:
@@ -1926,7 +1927,8 @@ public class StagingView extends ViewPart implements IShowInSource {
break;
case CONFLICTING:
case MODIFIED:
- case PARTIALLY_MODIFIED:
+ case MODIFIED_AND_CHANGED:
+ case MODIFIED_AND_ADDED:
case UNTRACKED:
addPaths.add(entry.getPath());
break;
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingViewContentProvider.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingViewContentProvider.java
index 7e9960e8d..a5e258d33 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingViewContentProvider.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingViewContentProvider.java
@@ -14,7 +14,8 @@ import static org.eclipse.egit.ui.internal.staging.StagingEntry.State.CONFLICTIN
import static org.eclipse.egit.ui.internal.staging.StagingEntry.State.MISSING;
import static org.eclipse.egit.ui.internal.staging.StagingEntry.State.MISSING_AND_CHANGED;
import static org.eclipse.egit.ui.internal.staging.StagingEntry.State.MODIFIED;
-import static org.eclipse.egit.ui.internal.staging.StagingEntry.State.PARTIALLY_MODIFIED;
+import static org.eclipse.egit.ui.internal.staging.StagingEntry.State.MODIFIED_AND_ADDED;
+import static org.eclipse.egit.ui.internal.staging.StagingEntry.State.MODIFIED_AND_CHANGED;
import static org.eclipse.egit.ui.internal.staging.StagingEntry.State.REMOVED;
import static org.eclipse.egit.ui.internal.staging.StagingEntry.State.UNTRACKED;
@@ -308,7 +309,10 @@ public class StagingViewContentProvider extends WorkbenchContentProvider {
nodes.add(new StagingEntry(repository, MISSING, file));
for (String file : indexDiff.getModified())
if (indexDiff.getChanged().contains(file))
- nodes.add(new StagingEntry(repository, PARTIALLY_MODIFIED,
+ nodes.add(new StagingEntry(repository, MODIFIED_AND_CHANGED,
+ file));
+ else if (indexDiff.getAdded().contains(file))
+ nodes.add(new StagingEntry(repository, MODIFIED_AND_ADDED,
file));
else
nodes.add(new StagingEntry(repository, MODIFIED, file));
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
index f3e184cc6..2873533f2 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
@@ -738,7 +738,7 @@ CommitAction_noFilesToCommit=No files to commit
CommitAction_repositoryState=Repository state: {0}
CommitDialog_AddFileOnDiskToIndex=Add File on &Disk to Index
CommitDialog_AddSOB=Add Signed-off-&by
-CommitDialog_AmendPreviousCommit=Am&end Previous Commit
+CommitDialog_AmendPreviousCommit=Am&end (Edit Previous Commit)
CommitDialog_Author=&Author:
CommitDialog_Commit=&Commit
CommitDialog_CommitAndPush=Commit and &Push
@@ -1711,7 +1711,7 @@ StagingView_StagedChanges=Staged Changes ({0})
StagingView_CommitMessage=Commit Message
StagingView_Committer=Committer:
StagingView_Author=Author:
-StagingView_Ammend_Previous_Commit=Amend Previous Commit
+StagingView_Ammend_Previous_Commit=Amend (Edit Previous Commit)
StagingView_Add_Signed_Off_By=Add Signed-off-by
StagingView_Add_Change_ID=Add Change-Id
StagingView_cancelCommitAfterSaving=Do you want to cancel the commit, so you can first handle (e.g. stage) the newly saved files?
diff --git a/org.eclipse.egit/egit.png b/org.eclipse.egit/egit.png
index ebe10a46e..799df8578 100644
--- a/org.eclipse.egit/egit.png
+++ b/org.eclipse.egit/egit.png
Binary files differ
diff --git a/org.eclipse.egit/egit.svg b/org.eclipse.egit/egit.svg
index d3ef0411a..bb2ccdf3e 100644
--- a/org.eclipse.egit/egit.svg
+++ b/org.eclipse.egit/egit.svg
@@ -1,134 +1,114 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="744.09448819"
- height="1052.3622047"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.45"
- sodipodi:docbase="/home/me/SW/EGIT"
- sodipodi:docname="egit.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:modified="TRUE">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
+ version="1.1"
+ id="Layer_1"
+ x="0px"
+ y="0px"
+ width="1024"
+ height="1024"
+ viewBox="0 0 1024 1024"
+ enable-background="new 0 0 612 792"
+ xml:space="preserve"
+ inkscape:version="0.48.5 r10040"
+ sodipodi:docname="egit.svg"><metadata
+ id="metadata68"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+ id="defs66"><linearGradient
+ id="linearGradient3857"
+ gradientUnits="userSpaceOnUse"
+ x1="131.3853"
+ y1="358.57709"
+ x2="131.3853"
+ y2="432.2084"
+ gradientTransform="matrix(1,0,0,-1,0,793)"><stop
+ offset="0.30179274"
+ style="stop-color:#473788"
+ id="stop3859" /><stop
+ offset="0.79185295"
+ style="stop-color:#2C2255"
+ id="stop3861" /></linearGradient><linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3857"
+ id="linearGradient3867"
+ gradientUnits="userSpaceOnUse"
+ x1="59.992634"
+ y1="83.283737"
+ x2="103.99626"
+ y2="83.283737" /></defs><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
+ borderopacity="1"
objecttolerance="10"
- inkscape:pageopacity="0.0"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="0.49497475"
- inkscape:cx="375"
- inkscape:cy="600.8122"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- inkscape:window-width="1888"
- inkscape:window-height="1089"
- inkscape:window-x="24"
- inkscape:window-y="0" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <path
- style="fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-opacity:1;opacity:1;fill:#00009d"
- d="M 393.09375 243.4375 C 391.93588 243.4345 390.78373 243.47407 389.625 243.53125 C 384.73269 243.52713 379.8298 243.49518 374.9375 243.5 C 369.25198 243.51616 363.59178 243.53489 357.90625 243.53125 C 350.64447 243.53625 343.35553 243.56327 336.09375 243.5625 C 328.70649 243.55149 321.32467 243.53746 313.9375 243.5 C 309.36153 243.53309 304.78014 243.46442 300.21875 243.90625 C 295.50486 244.55119 290.81001 245.3916 286.09375 245.90625 C 281.36201 246.51629 276.64609 247.33497 271.90625 247.75 C 266.73048 248.37656 261.54988 248.86465 256.5625 250.53125 C 250.98695 251.5076 245.40676 252.53038 239.71875 253.09375 C 233.01643 254.56837 226.30948 256.18682 219.4375 256.625 C 214.86213 257.30512 210.30151 257.8907 205.6875 258.21875 C 201.53486 258.95155 197.4118 259.90057 193.1875 260.03125 C 186.88004 260.92569 180.60274 261.90731 174.34375 263.125 C 169.48881 263.48822 164.63638 263.69637 159.78125 263.78125 C 159.22215 263.56811 158.65105 263.37468 158.09375 263.15625 L 157.09375 263.8125 C 154.02532 263.83139 150.95169 263.82452 147.875 263.71875 L 147.6875 263.875 C 147.38163 261.89184 147.09182 259.90608 146.875 257.90625 L 120.28125 271.78125 C 122.71588 284.07999 125.30225 296.34627 128.75 308.40625 C 130.90748 316.55504 133.26885 324.62643 136.09375 332.5625 C 137.91553 338.54836 140.80376 344.11773 143.46875 349.75 C 144.91818 354.3297 147.20646 358.50151 149.4375 362.71875 C 150.85509 366.61648 153.43705 369.67789 155.875 372.90625 C 158.64064 375.64025 161.25529 378.52883 163.9375 381.34375 C 166.41211 383.515 168.22022 386.26661 170.21875 388.84375 C 172.83158 391.68514 173.87202 395.32669 175.46875 398.6875 C 176.99236 403.04336 179.57063 406.94643 181.84375 410.9375 C 183.20359 414.54804 185.51768 417.60539 187.53125 420.84375 C 189.44915 424.08625 191.33887 427.35345 193.15625 430.625 C 195.38999 434.08852 198.55631 436.61267 201.53125 439.34375 C 204.40014 442.16384 208.01808 443.72573 211.40625 445.71875 C 214.21093 447.55649 217.34798 448.64467 220.34375 450.03125 C 223.56061 450.6976 226.732 451.56129 229.90625 452.40625 C 232.36984 453.50621 233.11437 456.38341 234.46875 458.5625 C 235.87037 461.59242 238.72399 463.06984 241.1875 465.03125 C 243.97863 466.61655 246.68767 468.31752 249.4375 469.96875 C 252.68357 472.30522 256.52162 472.32884 260.25 473.0625 C 264.26753 473.3604 268.31868 473.30067 272.34375 473.3125 C 276.39043 473.2981 280.42206 473.2895 284.46875 473.28125 C 288.51001 473.27582 292.5525 473.28194 296.59375 473.28125 C 301.13018 473.28224 305.65109 473.25718 310.1875 473.25 C 316.00214 473.25614 321.84165 473.23492 327.65625 473.21875 C 333.52894 473.22847 339.37731 473.24312 345.25 473.25 C 350.19168 473.35212 355.15705 473.2227 360.09375 473.125 C 366.00023 472.61659 371.30868 470.14192 376.71875 467.96875 C 391.45251 462.09507 403.90102 453.77662 414.96875 443.125 C 420.85767 438.11649 423.40981 431.62302 426.125 424.5625 C 430.64951 412.3115 435.6881 400.27162 440.78125 388.25 C 442.18926 385.1047 443.70219 382.02431 445.21875 378.9375 C 446.22444 380.68603 447.35786 382.3029 449.40625 383.21875 C 453.88733 383.96302 458.28934 384.97361 462.96875 384.40625 C 466.94245 384.37419 470.9383 384.45556 474.90625 384.1875 C 478.92876 383.59104 483.01421 383.36851 486.875 381.90625 C 491.81074 381.15775 496.67311 380.42213 501.4375 378.875 C 513.27608 372.21702 528.593 368.78032 536.09375 356.8125 C 537.71002 352.33649 539.44589 348.33594 538.65625 343.34375 C 538.65954 338.68657 538.66636 334.03214 538.65625 329.375 C 538.6187 324.47554 538.64724 319.58248 538.40625 314.6875 C 538.03315 310.20824 537.73897 305.72619 536.8125 301.3125 C 536.47604 296.90427 536.33862 292.43082 535.09375 288.15625 C 533.15581 284.54676 531.46207 280.88498 528.28125 278.0625 C 525.19762 275.87038 522.52756 273.04597 518.53125 272.5625 C 514.63682 272.13488 510.78496 271.21744 506.78125 271.71875 C 502.09017 271.79024 497.39801 271.73826 492.75 272.5 C 485.84199 273.87512 479.00627 275.53378 472.53125 278.40625 L 457.21875 290.53125 C 457.54656 286.83531 457.9912 283.15637 458.4375 279.46875 C 458.94747 275.6737 459.90191 271.96069 460.84375 268.25 C 460.94728 268.16321 461.05272 268.08679 461.15625 268 L 460.875 268.09375 C 461.13358 267.07456 461.41062 266.04813 461.65625 265.03125 C 461.67532 264.90528 461.69649 264.7809 461.71875 264.65625 C 460.41418 265.38264 458.39989 266.48434 455.96875 267.75 C 455.95303 267.72556 455.92216 267.71178 455.90625 267.6875 C 458.87969 266.06658 460.76276 265.07449 461.75 264.5625 C 462.35443 261.30247 463.98291 258.47202 465.21875 255.53125 L 449.71875 262.46875 C 448.66877 261.62661 447.66418 260.71915 446.84375 259.59375 C 443.3308 257.96091 439.77726 256.50433 436.46875 254.4375 C 432.69093 252.4702 428.94534 250.35112 424.90625 248.96875 C 421.39388 248.08882 417.87857 247.20365 414.28125 246.78125 C 410.70939 245.72501 407.09015 244.74351 403.46875 243.875 C 400.03142 243.67392 396.56736 243.44651 393.09375 243.4375 z M 461.75 264.5625 C 461.74406 264.59456 461.72449 264.62411 461.71875 264.65625 C 463.26307 263.79637 463.19991 263.81057 461.75 264.5625 z M 300.875 261.0625 C 304.59296 261.055 308.31331 261.06277 312.03125 261.0625 C 319.26362 261.07235 326.48638 261.08604 333.71875 261.09375 C 339.37209 261.09142 345.03419 261.10879 350.6875 261.125 C 355.58791 261.1297 360.47457 261.12915 365.375 261.125 C 369.89472 261.07533 374.42166 261.17452 378.9375 261.25 C 382.58126 261.68447 386.0494 262.87941 389.5625 263.875 C 393.16996 264.40456 396.67356 265.33183 400.21875 266.15625 C 404.19622 267.00166 407.76402 269.09242 411.375 270.875 C 414.72004 272.90227 418.26514 274.44829 421.75 276.1875 C 422.60321 276.99302 423.49915 277.77072 424.40625 278.53125 C 424.21605 278.59284 424.03321 278.65467 423.84375 278.71875 C 419.44177 280.78156 415.45985 282.82458 410.40625 282.59375 C 403.80147 283.36014 397.20206 284.33977 390.53125 283.96875 C 384.83365 283.96273 379.135 283.92484 373.4375 283.90625 C 369.27973 283.90752 365.12653 283.90059 360.96875 283.90625 C 356.29192 283.91262 351.61435 283.91696 346.9375 283.90625 C 341.84422 283.92239 336.74955 283.94834 331.65625 283.9375 C 325.53648 283.87549 319.4221 283.88583 313.3125 283.46875 C 306.60685 282.92327 299.88075 282.02407 293.15625 281.9375 C 287.28772 281.92194 281.43106 281.89924 275.5625 281.90625 C 271.11874 281.89549 266.66253 281.88976 262.21875 281.90625 C 257.8458 281.90683 253.49717 281.91408 249.125 281.8125 C 244.86534 281.61348 240.56831 281.57599 236.375 280.6875 C 232.07544 280.12347 227.83481 279.57906 223.46875 279.5 C 214.74443 278.10568 206.0634 276.48575 197.40625 274.6875 C 197.02106 274.60302 196.63497 274.52311 196.25 274.4375 C 202.87462 273.8106 209.40357 272.52942 215.90625 271.15625 C 221.49275 270.12138 227.15634 269.48054 232.78125 268.75 C 237.69786 267.19625 242.74553 266.4276 247.8125 265.625 C 252.57637 265.2832 257.30828 264.49767 262.03125 263.8125 C 266.7731 263.39098 271.45545 262.57626 276.15625 261.84375 C 280.65389 261.24033 285.19279 261.24103 289.71875 261.125 C 293.43652 261.08234 297.15704 261.07 300.875 261.0625 z M 152.4375 285.9375 C 159.35143 287.92647 166.31829 289.71766 173.3125 291.375 C 181.85452 293.2816 190.41022 295.09263 199 296.75 C 203.24775 297.24118 207.52544 297.59306 211.78125 297.9375 C 216.06222 298.88271 220.42835 299.03967 224.78125 299.34375 C 229.16508 299.52547 233.55101 299.50962 237.9375 299.53125 C 242.40007 299.53819 246.84997 299.54857 251.3125 299.53125 C 257.21055 299.53278 263.13323 299.48475 269.03125 299.46875 C 275.71043 299.36173 282.3294 300.26096 288.96875 300.875 C 295.10872 301.40336 301.28115 301.39085 307.4375 301.5 C 312.50757 301.54465 317.58605 301.55486 322.65625 301.5625 C 327.33221 301.5411 332.0115 301.55934 336.6875 301.5625 C 340.83879 301.56658 344.97372 301.56131 349.125 301.5625 C 354.873 301.54409 360.62692 301.50601 366.375 301.5 C 373.07569 301.81914 379.72403 301.0927 386.375 300.4375 C 391.41394 300.61979 395.74215 298.95951 400.34375 297.34375 C 405.04743 295.12856 410.19728 294.34684 415.25 293.34375 C 421.49524 291.99916 427.18208 289.42362 432.65625 286.34375 C 432.22168 288.43806 431.83186 290.53805 431.53125 292.65625 C 431.01138 297.88246 430.56846 303.1359 429.875 308.34375 C 429.46649 312.52766 428.63975 316.65014 429.125 320.90625 C 429.12053 323.49582 429.10691 326.0971 429.09375 328.6875 C 429.04322 328.71244 428.98784 328.72446 428.9375 328.75 C 425.23745 330.5209 421.91471 332.81762 417.75 333.625 C 413.76985 334.01373 409.84916 334.89102 405.78125 334.40625 C 401.41766 334.40981 397.05109 334.42535 392.6875 334.4375 C 386.96702 334.44915 381.25169 334.44563 375.53125 334.46875 C 368.61568 334.47705 361.69681 334.46161 354.78125 334.46875 C 348.09695 334.46546 341.40299 334.47476 334.71875 334.5 C 327.72473 334.49577 320.74382 334.49668 313.75 334.4375 C 308.08427 334.334 302.39631 334.33448 296.75 333.78125 C 292.01938 333.15706 287.28135 332.25427 282.5 332.40625 C 278.1953 332.38363 273.89151 332.4192 269.59375 332.125 C 264.47276 331.56268 259.36498 331.1126 254.375 329.71875 C 248.70352 328.97425 243.02392 328.0859 237.3125 327.75 C 232.74643 327.0894 228.22654 326.27491 223.625 325.96875 C 217.97697 324.98953 212.38047 323.91832 206.875 322.25 C 199.67678 319.73686 192.41626 317.17837 185.875 313.1875 C 179.50956 308.86181 173.4657 304.21314 168.03125 298.71875 L 157.8125 304.96875 C 156.71182 301.42591 155.67572 297.8509 154.65625 294.28125 C 153.90666 291.50669 153.16003 288.72179 152.4375 285.9375 z M 483.9375 289.3125 C 487.25256 289.21809 490.55568 289.57874 493.84375 289.75 C 497.45034 289.92721 499.87282 292.18484 502.75 293.9375 C 505.75212 296.21686 506.98708 299.66372 508.8125 302.6875 C 509.71566 306.81618 509.91129 311.08619 510.25 315.28125 C 511.22433 319.61252 511.42599 324.0309 511.75 328.4375 C 511.95701 333.28729 511.92852 338.14726 511.9375 343 C 511.92727 347.65472 511.91132 352.31401 511.90625 356.96875 C 512.35233 359.73897 511.93242 361.87884 511.09375 363.9375 C 511.02172 363.95221 510.947 363.95395 510.875 363.96875 C 506.93933 364.809 502.97913 365.48492 499.03125 366.25 C 495.13444 366.73581 491.19752 366.66158 487.28125 366.75 C 482.88885 367.04024 478.52689 366.61509 474.1875 366.28125 C 471.29836 365.90873 470.98924 362.57239 469.46875 360.8125 L 448.125 373 C 449.01367 371.15555 449.85114 369.30823 450.6875 367.4375 C 452.87784 361.22334 453.16076 354.64465 453.71875 348.15625 C 454.91692 341.41454 455.08822 334.57315 455.40625 327.75 C 455.64226 320.94886 455.72867 314.1478 455.8125 307.34375 C 455.30626 303.17072 456.30709 299.22207 456.875 295.15625 C 456.89877 294.71721 456.94021 294.28185 456.96875 293.84375 C 460.87272 292.52437 464.85192 291.47472 468.875 290.53125 C 473.36586 289.5796 477.93823 289.53567 482.5 289.375 C 482.974 289.34104 483.46392 289.32599 483.9375 289.3125 z M 168.84375 333.65625 C 173.1878 335.66093 177.6857 337.31183 182.15625 339 C 187.70533 340.81188 193.40142 342.00677 199.09375 343.21875 C 203.70537 343.695 208.29129 344.37096 212.875 345.0625 C 218.58859 345.47813 224.26226 346.26731 229.9375 347.03125 C 234.98433 348.10422 240.08273 348.82174 245.1875 349.53125 C 249.51658 349.98653 253.8727 349.98895 258.21875 350.0625 C 262.96276 349.80135 267.62322 350.50799 272.3125 351.09375 C 278.0195 351.77146 283.7643 351.83876 289.5 352 C 296.5374 352.05759 303.58745 352.01053 310.625 352 C 317.28801 352.01496 323.93073 352.0383 330.59375 352.03125 C 337.51801 352.03587 344.45076 351.99177 351.375 352 C 357.05963 352.02319 362.75283 352.01955 368.4375 352.03125 C 372.78467 352.04346 377.12158 352.05894 381.46875 352.0625 C 385.57234 352.26939 389.64187 351.9365 393.71875 351.6875 C 397.92743 351.08694 401.74412 349.2605 405.59375 347.65625 C 408.74349 345.34069 412.46112 345.08185 416.09375 344.1875 C 420.6425 343.51069 424.84896 341.91548 428.875 339.875 C 428.8589 340.29071 428.86228 340.70936 428.84375 341.125 C 428.44651 347.97434 427.96628 354.80047 426.96875 361.59375 C 426.36804 367.79746 426.06332 374.07776 423.5625 379.90625 C 420.29291 386.7996 416.74059 393.57594 413.875 400.65625 C 412.98642 402.81284 412.09771 404.96465 411.21875 407.125 C 406.98564 407.13635 402.76411 407.16673 398.53125 407.21875 C 393.24799 407.30232 387.92415 407.27969 382.6875 408.09375 C 377.77239 408.8361 372.93347 409.53837 367.9375 409.15625 C 363.64109 409.14863 359.32769 409.14595 355.03125 409.15625 C 350.45825 409.16147 345.8855 409.18843 341.3125 409.1875 C 336.3317 409.19489 331.35575 409.18811 326.375 409.21875 C 319.01991 409.2286 311.66596 409.24594 304.3125 409.0625 C 293.88387 408.74929 283.47065 408.31551 273.0625 407.5625 C 262.99355 407.29827 252.92107 407.18571 242.84375 407.15625 L 224.09375 420.78125 C 222.18744 419.15626 220.30948 417.48476 219 415.25 C 217.20586 412.0422 215.31338 408.79973 213.4375 405.59375 C 211.45429 402.45252 209.20769 399.46793 207.84375 395.96875 C 205.66249 392.13772 203.17841 388.42653 201.78125 384.21875 C 201.41552 383.38703 201.07699 382.55268 200.71875 381.71875 C 211.85976 382.85076 222.99895 383.95679 234.15625 384.9375 C 250.93672 386.23134 267.748 387.34517 284.5 388.96875 C 291.36054 389.9722 298.19217 391.01955 305.0625 391.9375 C 310.6923 392.45125 316.35403 392.41408 322 392.46875 C 327.72775 392.49762 333.45982 392.46606 339.1875 392.4375 C 345.50272 392.41155 351.80981 392.4195 358.125 392.4375 C 363.61326 392.44112 369.1055 392.4463 374.59375 392.4375 C 380.01234 392.43494 385.42517 392.45742 390.84375 392.46875 C 393.06465 392.47458 395.27909 392.46508 397.5 392.46875 L 421.78125 374.8125 C 419.55024 374.81617 417.32474 374.83793 415.09375 374.84375 C 409.65809 374.85501 404.21692 374.84644 398.78125 374.84375 C 393.30127 374.83484 387.82375 374.83927 382.34375 374.84375 C 376.00575 374.86428 369.6818 374.88895 363.34375 374.875 C 357.63077 374.86007 351.90049 374.84882 346.1875 374.875 C 340.60244 374.84186 335.01546 374.89986 329.4375 374.5625 C 322.45788 373.80919 315.52778 372.9548 308.59375 371.8125 C 291.59857 370.40356 274.57174 369.50023 257.5625 368.28125 C 242.53434 366.92195 227.57232 365.07968 212.625 363.0625 L 196.75 374.34375 C 196.54646 374.07078 196.34511 373.79585 196.125 373.53125 C 194.08248 370.85145 192.24013 367.96209 189.65625 365.75 C 186.93921 362.93895 184.30234 360.04274 181.53125 357.28125 C 179.35073 354.21887 176.70447 351.4592 175.46875 347.75 C 173.26595 343.58079 170.99427 339.47065 169.5 334.96875 C 169.28793 334.53006 169.05745 334.09434 168.84375 333.65625 z M 429.03125 333.78125 C 429.02516 334.15789 429.03863 334.52964 429.03125 334.90625 L 422.53125 337.4375 C 424.10773 336.55269 426.47854 335.23008 429.03125 333.78125 z M 407.65625 415.9375 C 404.85991 422.91331 402.11365 429.9067 399.375 436.90625 C 396.35303 443.70184 393.03111 449.71009 387.25 454.53125 C 387.23772 454.54207 387.23102 454.5517 387.21875 454.5625 C 386.21045 454.84904 385.19853 455.11524 384.15625 455.3125 C 379.28709 455.5379 374.39908 455.83898 369.5 455.65625 C 363.60174 455.66315 357.71076 455.67781 351.8125 455.6875 C 346.02816 455.67127 340.22187 455.65019 334.4375 455.65625 C 329.92036 455.6489 325.42341 455.62398 320.90625 455.625 C 316.86421 455.62523 312.82329 455.62178 308.78125 455.625 C 304.7338 455.63087 300.67241 455.63793 296.625 455.65625 C 292.6487 455.65928 288.66256 455.72377 284.6875 455.59375 C 281.29811 455.21112 277.81288 455.41232 274.71875 453.6875 C 271.9349 451.97109 269.1635 450.2727 266.375 448.5625 C 264.28259 446.97553 261.58552 446.08462 260.5 443.375 C 258.90662 440.53878 257.60036 437.39425 254.8125 435.53125 C 251.61626 434.62825 248.41348 433.51524 245.125 432.96875 C 242.28639 431.73985 239.02331 431.35334 236.53125 429.21875 C 233.79041 427.76471 230.9661 426.58651 228.53125 424.6875 C 235.384 424.66774 242.21174 424.73365 249.0625 424.84375 C 259.43021 425.47356 269.81079 426.01522 280.1875 426.46875 C 287.52324 426.72364 294.87951 426.73388 302.21875 426.78125 C 307.171 426.81711 312.11022 426.81447 317.0625 426.8125 C 321.6275 426.80466 326.18501 426.8087 330.75 426.8125 C 335.05381 426.8223 339.35245 426.82006 343.65625 426.8125 C 348.70317 427.1203 353.68675 426.55316 358.6875 426.0625 C 363.88013 425.17665 369.1249 425.03077 374.375 424.84375 C 379.95351 424.73447 385.54584 424.77337 391.125 424.78125 C 392.58713 424.78567 394.03786 424.7774 395.5 424.78125 L 407.65625 415.9375 z "
- id="path2180"
- inkscape:export-filename="/home/me/SW/EGIT/org.eclipse.egit/egit.png"
- inkscape:export-xdpi="6.8800001"
- inkscape:export-ydpi="6.8800001" />
- <path
- style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- id="path2194"
- d="M 180.21134,205.12283 C 187.39315,205.22947 194.5762,205.17493 201.75843,205.14707 C 206.65543,205.11562 211.55244,205.12107 216.44948,205.12267 C 220.92575,205.11998 225.40201,205.11489 229.87828,205.11075 C 234.44165,205.12123 239.00502,205.11968 243.56841,205.11703 C 247.79287,205.11157 252.01733,205.11024 256.2418,205.10833 C 260.38535,204.87849 264.43511,205.82978 268.50303,206.50671 C 269.16813,206.57806 269.83322,206.6494 270.49832,206.72075 L 245.98475,224.07852 C 245.30447,223.98513 244.62419,223.89173 243.94391,223.79833 C 239.95662,223.17746 236.0038,222.45938 231.9425,222.76281 C 227.72601,222.7609 223.50952,222.75957 219.29304,222.75411 C 214.72389,222.75145 210.15477,222.74993 205.58564,222.76039 C 201.12031,222.75625 196.65498,222.75116 192.18964,222.74847 C 187.31499,222.75007 182.44036,222.7557 177.56575,222.72407 C 170.36128,222.69582 163.15603,222.64253 155.95196,222.74831 L 180.21134,205.12283 z "
- inkscape:export-filename="/home/me/SW/EGIT/org.eclipse.egit/egit.png"
- inkscape:export-xdpi="6.8800001"
- inkscape:export-ydpi="6.8800001" />
- <path
- style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- id="path2196"
- d="M 324.11058,166.75575 C 333.97151,166.8949 343.83393,166.85059 353.6955,166.82681 C 360.72934,166.79736 367.76324,166.77782 374.79709,166.75539 C 379.6913,167.47735 384.60087,168.00043 389.52062,168.48847 C 393.58962,168.76603 397.66904,168.71338 401.74409,168.75748 C 405.77312,168.75878 409.80214,168.75171 413.83116,168.74682 C 415.17714,168.74533 416.52313,168.74496 417.86911,168.74403 L 393.56864,186.40203 C 392.22283,186.4033 390.87702,186.40406 389.53121,186.40584 C 385.49797,186.40901 381.46467,186.42272 377.43147,186.39949 C 373.31223,186.32701 369.18646,186.3262 365.08154,185.9194 C 360.25782,185.34168 355.43917,184.61784 350.58821,184.34416 C 343.6199,184.32174 336.65153,184.30225 329.68323,184.27274 C 319.75645,184.24864 309.82886,184.20616 299.9027,184.3438 L 324.11058,166.75575 z "
- inkscape:export-filename="/home/me/SW/EGIT/org.eclipse.egit/egit.png"
- inkscape:export-xdpi="6.8800001"
- inkscape:export-ydpi="6.8800001" />
- <path
- style="fill:#008000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- id="path2198"
- d="M 194.2644,107.78654 C 201.63875,107.11284 209.02551,106.66968 216.42172,106.34287 C 221.58437,106.13708 226.75102,106.13291 231.91658,106.10234 C 236.0015,106.09944 240.08641,106.10529 244.17133,106.10882 C 248.19705,106.11196 252.22277,106.1117 256.24849,106.11247 C 260.83385,105.50783 264.60064,107.37031 268.70876,109.00105 C 272.39333,111.15222 276.53968,111.28094 280.59154,111.99909 C 284.04275,112.72231 287.33267,113.88102 290.69482,114.83923 C 294.04742,116.02678 297.60521,115.8886 301.09032,116.16365 C 305.99995,117.06004 309.79324,115.59564 314.20432,114.03578 C 242.22534,155.02622 371.7546,80.967962 296.51328,124.10544 L 324.50811,113.25345 C 236.61098,164.20926 383.7941,79.065014 290.66417,132.62578 C 286.02801,133.44285 281.53261,134.46208 276.71751,133.69084 C 273.03001,133.20963 269.25318,133.2196 265.76385,131.69731 C 262.5587,130.86293 259.37382,129.85031 256.08211,129.36231 C 251.83993,128.47146 247.59254,127.75614 243.72046,125.62734 C 239.78925,124.43679 236.17578,123.18489 231.94636,123.76864 C 227.91986,123.7676 223.89336,123.76802 219.86687,123.76362 C 215.78976,123.75841 211.71266,123.75102 207.63555,123.75208 C 202.5355,123.78161 197.4342,123.78243 192.33723,123.99297 C 184.94026,124.36327 177.54116,124.76758 170.18317,125.65198 L 194.2644,107.78654 z "
- inkscape:export-filename="/home/me/SW/EGIT/org.eclipse.egit/egit.png"
- inkscape:export-xdpi="6.8800001"
- inkscape:export-ydpi="6.8800001" />
- <path
- style="fill:#008000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- id="path2200"
- d="M 267.03265,66.549954 C 263.41649,72.645583 260.20238,78.842178 257.64687,85.433131 C 256.19035,90.087322 255.98444,94.958099 255.59536,99.77827 C 254.77321,103.78802 254.49333,107.86379 254.03831,111.91827 C 253.77561,116.22431 253.80478,120.53975 253.76541,124.8513 C 253.39735,129.28787 252.73629,133.69867 252.19702,138.11888 C 251.80724,142.13699 251.85588,146.17532 251.77386,150.20559 C 251.7257,150.85468 251.67754,151.50376 251.62938,152.15285 L 224.65258,165.43279 C 224.76881,164.89757 224.88504,164.36234 225.00126,163.82711 C 225.04027,159.72032 225.01877,155.60908 225.31929,151.51006 C 225.79345,147.14679 226.25689,142.78899 227.0385,138.46432 C 227.03965,134.10484 226.99492,129.74305 227.18797,125.38649 C 227.5149,121.25324 227.73853,117.10673 228.66761,113.04655 C 229.11102,108.08657 229.40382,103.04785 230.6118,98.185181 C 232.89744,91.323362 236.0407,85.05629 239.6676,78.787803 L 267.03265,66.549954 z "
- inkscape:export-filename="/home/me/SW/EGIT/org.eclipse.egit/egit.png"
- inkscape:export-xdpi="6.8800001"
- inkscape:export-ydpi="6.8800001" />
- <path
- style="fill:#008000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- id="path2202"
- d="M 364.05911,98.046663 C 370.29809,98.856864 376.46198,100.23887 382.65401,101.37629 C 387.27537,102.06232 391.94919,102.01788 396.60603,102.10871 C 402.01379,102.15688 407.42168,102.12298 412.82947,102.10353 C 417.20821,102.0827 421.587,102.07938 425.96578,102.07357 C 429.33501,102.07109 432.70424,102.07192 436.07347,102.0715 L 411.77122,119.72813 C 408.40362,119.72815 405.03601,119.72821 401.66841,119.72816 C 397.30683,119.72788 392.94525,119.72792 388.58367,119.72592 C 383.16149,119.7236 377.73915,119.73594 372.3171,119.7009 C 367.573,119.52591 362.80993,119.4985 358.12923,118.57897 C 352.06964,117.36185 346.00366,115.78372 339.79972,115.67214 L 364.05911,98.046663 z "
- inkscape:export-filename="/home/me/SW/EGIT/org.eclipse.egit/egit.png"
- inkscape:export-xdpi="6.8800001"
- inkscape:export-ydpi="6.8800001" />
- <path
- style="fill:#008000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- id="path2204"
- d="M 430.83361,52.479939 C 425.51255,64.978696 421.16352,77.851053 416.36418,90.550123 C 412.04712,100.80775 407.79918,111.08712 403.66568,121.42091 C 401.46338,126.9183 399.21297,132.38448 396.84515,137.80836 C 396.29868,138.99813 395.64712,140.13374 395.04811,141.29643 L 367.54407,153.42925 C 368.18701,152.33614 369.28325,151.51389 369.47288,150.14994 C 372.13048,144.82511 374.42544,139.38004 376.72857,133.88203 C 380.98816,123.54543 385.07593,113.14072 389.65166,102.93731 C 394.63533,90.433579 398.97091,77.679452 403.63939,65.056874 L 430.83361,52.479939 z "
- inkscape:export-filename="/home/me/SW/EGIT/org.eclipse.egit/egit.png"
- inkscape:export-xdpi="6.8800001"
- inkscape:export-ydpi="6.8800001" />
- <path
- style="fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- id="path3386"
- d="M 176.39952,296.04592 C 186.62559,296.46867 196.90769,296.88532 207.05445,298.27157 C 220.70861,300.48057 234.25621,303.18444 247.99884,304.86688 C 256.9802,305.81067 265.99145,306.0118 274.97288,306.91902 C 283.68045,307.81791 292.43584,307.96674 301.17964,308.1473 C 307.02395,308.22119 312.86872,308.18681 318.71323,308.16843 C 322.83278,308.14976 326.95238,308.14974 331.07196,308.14415 C 335.08949,308.14211 339.10702,308.14282 343.12454,308.14272 C 347.23873,308.13738 351.35291,308.14618 355.46707,308.15237 C 360.02681,308.16089 364.58656,308.15276 369.1463,308.14843 C 373.45542,308.13811 377.76451,308.14868 382.07361,308.15616 C 386.5971,308.52663 390.94291,307.81655 395.37032,307.04063 C 399.93909,306.45566 404.55521,306.16702 409.13448,305.83833 C 413.93936,305.13146 418.77661,304.50413 423.57086,303.8746 C 427.71199,302.9817 431.76911,301.83561 435.88183,300.81782 C 439.98979,300.48937 443.9819,299.78798 448.00847,298.93114 C 452.03255,297.95901 456.06821,297.14906 460.1591,296.44768 C 460.84447,296.38793 461.52983,296.32818 462.21519,296.26842 L 438.11319,314.19335 C 437.45173,314.28434 436.79026,314.37532 436.1288,314.46631 C 432.10593,315.34387 428.0975,316.29665 424.04556,317.03702 C 420.02198,317.71133 415.99369,318.30221 411.97364,318.99274 C 407.88311,320.11613 403.79933,321.28728 399.59721,321.9316 C 394.75988,322.4702 389.92643,323.02669 385.10687,323.71349 C 380.5151,324.04048 375.90518,324.24695 371.36574,325.07184 C 366.85089,325.56177 362.37506,326.10462 357.80808,325.7861 C 353.49188,325.79356 349.1757,325.80416 344.85948,325.79383 C 340.30339,325.78948 335.74728,325.78134 331.19119,325.7898 C 327.06829,325.79591 322.94537,325.80459 318.82244,325.79938 C 314.80488,325.80026 310.78732,325.80013 306.76976,325.80334 C 302.65979,325.80604 298.54982,325.81277 294.43986,325.8049 C 288.64974,325.76913 282.85925,325.74607 277.07073,325.58623 C 268.26953,325.32763 259.45892,325.0944 250.69407,324.18927 C 241.76565,323.41433 232.80266,323.05582 223.90923,321.8934 C 210.22101,319.97713 196.68405,317.18709 182.99232,315.32182 C 172.76091,314.28384 162.4524,313.57421 152.16589,313.65268 L 176.39952,296.04592 z "
- inkscape:export-filename="/home/me/SW/EGIT/org.eclipse.egit/egit.png"
- inkscape:export-xdpi="6.8800001"
- inkscape:export-ydpi="6.8800001" />
- <path
- style="fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- id="path3394"
- d="M 210.51327,338.33706 C 216.25132,341.94327 222.29586,344.98572 228.32829,348.05475 C 231.36962,350.90856 235.03898,351.29871 238.76155,352.37583 C 242.55924,352.73949 246.3781,352.61862 250.18669,352.64288 C 254.22259,352.61847 258.25854,352.60851 262.29449,352.59689 C 266.88636,352.61268 271.47827,352.60163 276.07015,352.59676 C 280.23904,352.59183 284.40794,352.59133 288.57684,352.59009 C 292.61695,352.58951 296.65706,352.58971 300.69717,352.58967 C 304.81202,352.5842 308.92686,352.59297 313.04168,352.59911 C 317.60111,352.60761 322.16055,352.59947 326.71997,352.59514 C 330.84322,352.59115 334.96647,352.59087 339.08972,352.58996 C 343.91464,352.95921 348.47245,351.39998 353.08482,350.20142 C 358.10914,348.9355 363.2871,348.88071 368.42476,348.60666 C 372.78213,348.49417 377.14127,348.52534 381.49957,348.5287 C 385.62251,348.53508 389.74545,348.54626 393.86836,348.55637 C 398.42332,348.56719 402.97829,348.55882 407.53325,348.55472 C 412.20407,348.57326 416.87495,348.56167 421.5458,348.55675 C 425.71158,348.55152 429.87737,348.55091 434.04316,348.54954 C 438.18102,348.32145 442.22541,349.27221 446.28781,349.94837 C 448.28992,350.63086 450.37386,351.01266 452.41457,351.5442 L 427.71468,368.62608 C 425.71924,368.16402 423.75761,367.5507 421.72871,367.23999 C 417.74653,366.61973 413.79876,365.90157 409.74263,366.20492 C 405.58341,366.20358 401.4242,366.20297 397.26499,366.19783 C 392.59209,366.19301 387.91916,366.18164 383.24628,366.20012 C 378.6944,366.1953 374.14251,366.18746 369.59063,366.19215 C 365.46005,366.19217 361.32946,366.19553 357.19888,366.17795 C 352.87976,366.18417 348.55871,366.14928 344.24227,366.33489 C 339.21692,366.7351 334.16717,366.96685 329.28288,368.37057 C 324.47573,369.41252 319.77752,370.74733 314.78863,370.24573 C 310.67014,370.24481 306.55164,370.24454 302.43315,370.24055 C 297.87736,370.23621 293.32157,370.22808 288.76578,370.23658 C 284.6423,370.24271 280.51881,370.2515 276.39531,370.24599 C 272.35569,370.24589 268.31607,370.24609 264.27645,370.24525 C 260.114,370.24378 255.95156,370.24276 251.78911,370.23854 C 247.19195,370.23652 242.5947,370.22464 237.99762,370.25906 C 233.95897,370.27387 229.92033,370.29326 225.88166,370.29917 C 221.95425,370.19315 217.99204,370.36776 214.11378,369.59313 C 210.37806,368.11168 206.45933,367.20891 203.2825,364.46477 C 197.23581,361.2623 191.21315,358.02275 185.29253,354.59038 L 210.51327,338.33706 z "
- inkscape:export-filename="/home/me/SW/EGIT/org.eclipse.egit/egit.png"
- inkscape:export-xdpi="6.8800001"
- inkscape:export-ydpi="6.8800001" />
- <path
- style="fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- id="path3396"
- d="M 226.72068,388.06546 C 233.72893,390.90997 240.92529,393.16824 247.95201,395.97857 C 253.55935,398.83215 259.46747,400.76714 265.43056,402.68927 C 270.26447,404.41567 275.21208,405.72191 280.17186,407.00115 C 284.38165,408.19931 288.5821,409.35622 292.81511,410.45295 C 296.75797,411.18407 300.77215,411.06806 304.75829,411.20241 C 308.64842,411.75351 312.35221,410.8004 316.11695,410.36823 C 319.99053,409.3962 323.98859,409.42355 327.94906,409.24728 C 332.30249,409.13391 336.65764,409.1523 341.01208,409.14573 C 345.63248,409.17243 350.25298,409.16431 354.87343,409.1635 C 359.03916,409.16073 363.20489,409.15991 367.37062,409.15883 C 371.35116,409.45236 374.92991,407.75287 378.62631,406.71092 C 382.3959,405.89191 385.86931,404.24432 389.37127,402.67044 C 393.00036,401.62634 396.67258,400.74057 400.28069,399.64204 C 400.88973,399.56426 401.49876,399.48649 402.1078,399.40871 L 378.0889,417.49569 C 377.51496,417.62244 376.94102,417.74918 376.36708,417.87593 C 372.82008,418.96061 369.26114,420.01547 365.75736,421.22602 C 362.18578,422.71941 358.66183,424.21009 354.89936,425.18331 C 350.99394,425.96309 347.14111,427.22067 343.07009,426.81401 C 338.91036,426.81207 334.75064,426.81136 330.59092,426.80332 C 325.9666,426.79492 321.34223,426.77802 316.71792,426.79804 C 312.39483,426.8161 308.06973,426.79277 303.74974,426.98884 C 299.85328,427.32835 295.94366,427.51004 292.13807,428.52592 C 288.24975,428.69419 284.3386,429.1152 280.42158,428.81085 C 276.30601,428.60548 272.16103,428.5641 268.13389,427.55873 C 263.90703,426.33705 259.67041,425.14006 255.43236,423.95049 C 250.46386,422.59917 245.50143,421.2616 240.6539,419.50268 C 234.71696,417.43269 228.83241,415.32932 223.15408,412.59416 C 216.13925,409.82086 209.00985,407.41057 201.89333,404.91057 L 226.72068,388.06546 z "
- inkscape:export-filename="/home/me/SW/EGIT/org.eclipse.egit/egit.png"
- inkscape:export-xdpi="6.8800001"
- inkscape:export-ydpi="6.8800001" />
- <path
- style="fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- id="path3398"
- d="M 273.14538,443.51883 C 280.32719,443.62548 287.51023,443.57093 294.69246,443.54307 C 299.45482,443.29599 304.21081,443.62101 308.92662,443.88913 C 313.28005,444.91646 317.74287,445.06832 322.18118,445.38089 C 326.45541,445.55649 330.73379,445.53005 335.0105,445.54165 C 339.06284,445.53577 343.11518,445.53178 347.16752,445.527 C 351.87468,445.53212 356.58186,445.54066 361.28904,445.54623 C 366.69362,445.55717 372.09822,445.54966 377.50281,445.54865 C 382.07253,445.77162 386.65228,445.42158 391.15611,445.12329 C 391.72399,444.98624 392.29186,444.84918 392.85973,444.71213 L 368.86969,462.84112 C 368.26943,462.92645 367.66918,463.01179 367.06892,463.09712 C 362.47067,463.14713 357.8701,463.20778 353.26975,463.15497 C 347.86295,463.15391 342.45614,463.14622 337.04936,463.15766 C 332.32199,463.16453 327.59464,463.1725 322.86729,463.18555 C 318.81442,463.18945 314.76153,463.19856 310.70866,463.18894 C 306.40649,463.14532 302.10095,463.15313 297.80547,462.86827 C 293.33068,462.4476 288.85718,462.07796 284.43008,461.25734 C 279.78913,461.17622 275.14445,461.08595 270.49978,461.12008 C 263.29531,461.09183 256.09007,461.03853 248.88599,461.14431 L 273.14538,443.51883 z "
- inkscape:export-filename="/home/me/SW/EGIT/org.eclipse.egit/egit.png"
- inkscape:export-xdpi="6.8800001"
- inkscape:export-ydpi="6.8800001" />
- </g>
-</svg>
+ inkscape:window-width="1440"
+ inkscape:window-height="834"
+ id="namedview64"
+ showgrid="true"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:zoom="0.5"
+ inkscape:cx="337.61231"
+ inkscape:cy="539.67392"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="Layer_1"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:snap-global="false"><sodipodi:guide
+ orientation="1,0"
+ position="564,-16"
+ id="guide3764" /><inkscape:grid
+ type="xygrid"
+ id="grid3770"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true"
+ spacingx="128px"
+ spacingy="128px" /></sodipodi:namedview><path
+ transform="matrix(9.2443236,0,0,9.2443236,-91.099239,-79.891299)"
+ d="m 119.55508,64.027542 a 48.661018,48.661018 0 1 1 -97.322033,0 48.661018,48.661018 0 1 1 97.322033,0 z"
+ sodipodi:ry="48.661018"
+ sodipodi:rx="48.661018"
+ sodipodi:cy="64.027542"
+ sodipodi:cx="70.894066"
+ id="path3924"
+ style="fill:#2c2255;fill-opacity:1"
+ sodipodi:type="arc" /><g
+ id="g13"
+ transform="matrix(9.1849384,0,0,9.1849384,-642.88022,-2967.521)"><path
+ d="m 79.6,378.829 c 0,-25.824 19.395,-47.281 44.626,-51.055 -0.626,-0.023 -1.255,-0.048 -1.887,-0.048 -28.314,0 -51.269,22.88 -51.269,51.103 0,28.224 22.954,51.103 51.269,51.103 0.634,0 1.263,-0.024 1.891,-0.047 C 98.995,426.111 79.6,404.654 79.6,378.829 z"
+ id="path15"
+ inkscape:connector-curvature="0"
+ style="fill:#f7941e" /></g><path
+ sodipodi:type="arc"
+ style="fill:url(#linearGradient3867);fill-opacity:1"
+ id="path3839"
+ sodipodi:cx="93.362816"
+ sodipodi:cy="83.283737"
+ sodipodi:rx="20.096365"
+ sodipodi:ry="20.096365"
+ d="m 113.45918,83.283737 a 20.096365,20.096365 0 1 1 -40.192729,0 20.096365,20.096365 0 1 1 40.192729,0 z"
+ transform="matrix(0,-15.40426,15.40426,0,-718.65592,1950.1852)" /><path
+ style="fill:#ffffff;fill-opacity:1"
+ d="m 400.03658,92.992381 c -20.77969,8.151399 -40.8173,17.817679 -59.95579,28.838399 l 153.29419,152.5442 c -11.58596,27.74412 -6.21332,60.91924 16.375,83.5 7.39212,7.41372 15.89228,13.0214 25,16.75 l 0,273.49999 c -9.10772,3.7286 -17.62844,9.3872 -25,16.75 -29.8242,29.821 -29.8242,78.1334 0,108 29.80256,29.8112 78.17572,29.8112 108,0 29.82424,-29.8666 29.82424,-78.179 0,-108 -6.05812,-6.0407 -12.8598,-10.8994 -20.125,-14.5 l 0,-271.12499 103,103.125 c -11.3756,27.63892 -5.80608,60.54728 16.625,83 29.85896,29.8416 78.15412,29.8416 108,0 29.82424,-29.84052 29.82424,-78.18444 0,-108 -21.35196,-21.38124 -52.14388,-27.33908 -78.875,-18.125 l -110.5,-110.5 c 9.22708,-26.73116 3.22696,-57.51436 -18.125,-78.875 -21.224,-21.22832 -51.74032,-27.24388 -78.375,-18.25 z"
+ id="path3841"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccccccccccccccccc" /></svg> \ No newline at end of file

Back to the top