Run all existing tests. It does not take very long.
-
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.
+
Pay attention to the Java and Eclipse SDK baselines. EGit requires only Java 7 and Eclipse 3.8.2. You cannot use API's that are newer.
-
Note: In order to test in Eclipse 3.5 (Galileo), consider building EGit with the platform-galileo maven profile (see the
- Maven Build Sequence for more details).
-
Sending patches by mail
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
git send-email. Instead, please use
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
index d9dec5ef32..82f48a6120 100644
--- 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
@@ -58,13 +58,13 @@
Restart
Java Requirements
-
EGit and JGit have Java 5.0 and
+
EGit and JGit have Java 7.0 and
Eclipse Platform 3.8.2 (Juno) as minimum requirements, so dependencies to newer Java and platform versions must be avoided.
We are using
PDE/API Tools Environment Descriptions (see changes for
JGit and
- EGit) to facilitate detecting code which isn't working on Java 5. If you followed the instructions in the
+ EGit) to facilitate detecting code which isn't working on Java 7. If you followed the instructions in the
Tools section above, the necessary descriptions should already be installed. Otherwise install
PDE/API Tools Environment Descriptions from the release train repository, see
Installing Execution Environment Descriptions.
diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Documentation.html b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Documentation.html
index a17bd3ef6b..257d6e8a9b 100644
--- a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Documentation.html
+++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Documentation.html
@@ -63,6 +63,9 @@
build-server and add the Maven goals
site:site site:deploy.
+
If you uploaded the site for a new release update the index
+ /home/data/httpd/download.eclipse.org/jgit/docs/latest/apidocs/index.html
+ to refer to the new release's site.
EGit
The EGit project sources its documentation from the wiki and generates Eclipse help content from it (under the covers, we are using
Mylyn WikiText to make this possible). This significantly lowers the barrier for people to contribute documentation to the EGit project. To contribute documentation, simply modify the
diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Tests.html b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Tests.html
index 3ff25984bd..a3f2ad75a4 100644
--- a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Tests.html
+++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Tests.html
@@ -40,8 +40,8 @@
To run these tests from Eclipse the Jetty feature is needed. Use one of the target platforms as described in
dependencies.
The EGit Core tests are executed during the maven build for the bundle
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.7/3.7.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.7/3.7.html
deleted file mode 100644
index 5c8c251ba2..0000000000
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.7/3.7.html
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
The following 11 developers worked on this release:
-
Alexander Kurtakov,
- Andreas Hermann,
- Andrey Loskutov,
- Christian Georgi,
- Christian Halstrick,
- Johannes Dorn,
- Markus Keller,
- Matthias Sohn,
- Michael Keppler,
- Robin Stocker,
- Tomasz Zarna
The following 21 developers worked on this release:
+
Andrey Loskutov,
+ Christian Georgi,
+ Christian Halstrick,
+ Chris Rebert,
+ Dani Megert,
+ Erwin van Eyk,
+ Fabio Zadrozny,
+ Gunnar Wagenknecht,
+ Jon Ander Peñalba,
+ Kyle J. Harms,
+ Lars Vogel,
+ Laurent Delaigue,
+ Laurent Goubet,
+ Markus Keller,
+ Matthias Sohn,
+ Max Hohenegger,
+ Michael Mathews,
+ Michael Keppler,
+ Mickael Istria,
+ Radim Hopp,
+ rnveach
+
+
\ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.0/Updating-This-Document.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.0/Updating-This-Document.html
new file mode 100644
index 0000000000..bb6ac72ddd
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.0/Updating-This-Document.html
@@ -0,0 +1,55 @@
+
+
+
+
+ EGit 4.0 New and Noteworthy - Updating This Document
+
+
+
+
+
+
\ No newline at end of file
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 57dbcef684..db94b0b0cd 100644
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html
@@ -713,6 +713,20 @@
Gitflow operation will not appear, unless the selected repository is configured for Gitflow. To do that, open the context menu on a repository in the Git Repositories view and select
+ Init Git Flow.
+ You can skip this step, if your repository was already configured for Gitflow by another client.
+
+
Starting a feature/release/hotfix
+
Right-click on a repository, select
+ Git Flow, and select the appropriate start command.
+
+
A dialog will appear that lets you enter a name for the Gitflow branch, adding the correct prefix automatically.
Inspecting the state of the Repository
Label Decorations
Label decorations show Git-specific information about resources under Git version control. They appear in all views showing model objects, like Package Explorer, Project Explorer, Navigator, and Hierarchy View.
@@ -1025,7 +1039,8 @@
The commit message editor supports content assist for file names shown in Files section of the commit dialog, which can be activated pressing Ctrl+Space.
The following 20 developers worked on this release of JGit :
+
Andrey Loskutov,
+ André de Oliveira,
+ Christian Halstrick,
+ Dave Borowitz,
+ David Ostrovsky,
+ David Pletcher,
+ Hector Oswaldo Caballero,
+ Hugo Arès,
+ Jonathan Nieder,
+ Kaloyan Raev,
+ Laurent Delaigue,
+ Markus Duft,
+ Matthew Spurrier,
+ Matthias Sohn,
+ Saša Živkov,
+ Sebastian Schuberth,
+ Shawn Pearce,
+ Stefan Beller,
+ Terry Parker,
+ Yuxuan 'fishy' Wang
+
+
\ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.0/Updating-This-Document.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.0/Updating-This-Document.html
new file mode 100644
index 0000000000..9e937c231d
--- /dev/null
+++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.0/Updating-This-Document.html
@@ -0,0 +1,55 @@
+
+
+
+
+ JGit 4.0 New and Noteworthy - Updating This Document
+
+
+
+