For EGit version 3.0, platform-juno (Eclipse 4.2) and platform-kepler (Eclipse 4.3) are available. In addition platform-kepler-staging refers to the Kepler staging repository.
+
For EGit version 4.6, egit-4.5 (Mars, Eclipse 4.5), egit-4.6 (Neon, Eclipse 4.6), and egit-4.7 (Oxygen, Eclipse 4.7) are available. In addition egit-4.7-staging refers to the Oxygen staging repository.
Upon a successful build, a p2 update site should be generated inside
- egit/org.eclipse.egit.repository/target/repository. If not, make sure the target platform has been downloaded from within Eclipse (Windows>Preferences>Plug-in Development>Target Platform). The default target platform defined in the maven build is currently Eclipse 4.3.
+ egit/org.eclipse.egit.repository/target/repository. If not, make sure the target platform has been downloaded from within Eclipse (Windows>Preferences>Plug-in Development>Target Platform). The default target platform defined in the maven build is currently Eclipse 4.6. If you skip setting the system property target-platform the target platform for Eclipse 4.6 will be used.
+
JGit Buck Build
+
The JGit libraries used by Gerrit Code Review can also be built using
+ buck:
+
As part of the build, JGit and EGit run FindBugs and PMD to find issues.
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
index 4872b079b..76259eede 100644
--- a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Contributing-Patches.html
+++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Contributing-Patches.html
@@ -369,7 +369,7 @@ Copyright (C) YEAR Your Name <you@example.org>
Run all existing tests. It does not take very long.
-
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.
+
Pay attention to the Java and Eclipse SDK baselines. EGit requires only Java 8 and Eclipse 4.4. You cannot use API's that are newer.
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
diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Manual-Developer-Setup.html b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Manual-Developer-Setup.html
index 6368eb209..6e4b20647 100644
--- a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Manual-Developer-Setup.html
+++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Manual-Developer-Setup.html
@@ -118,13 +118,13 @@ git clone <enter URL>
Restart
Java Requirements
-
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.
+
EGit and JGit have Java 8.0 and
+ Eclipse Platform 4.4 (Luna) as minimum requirements, so dependencies to newer Java and platform versions must be avoided.
We are using
API Tools Environment Descriptions (see changes for
JGit and
- EGit) to facilitate detecting code which isn't working on Java 7. If you followed the instructions in the
+ EGit) to facilitate detecting code which isn't working on Java 8. If you followed the instructions in the
Tools section above, the necessary descriptions should already be installed. Otherwise install
API Tools Environment Descriptions from the release train repository, see
Installing Execution Environment Descriptions.
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.5/4.5.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.5/4.5.html
deleted file mode 100644
index 82ae9adc0..000000000
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.5/4.5.html
+++ /dev/null
@@ -1,80 +0,0 @@
-
-
-
Staging view: Fix expansion problems and provide auto selection support.
-
Check for running launches before modifying the workspace before checkout, pull, rebase, interactive rebase, merge, reset --hard, replace with, cherry-pick
-
GitHistoryPage: move the search widget into the toolbar
-
Auto-stage selected files on "Commit..." when staging view is used
-
Added context menu support for nested repositories.
-
Immediate user feedback on failed push background jobs
-
Push to Gerrit in a background job
-
Allow to cancel the deletion of branches operation
-
Avoid opening dialogs from push/fetch background jobs
-
Recompute index diff (git status) on project deletions
-
Polish the UI of the rebase interactive view
-
Open the smart import wizard if available (Eclipse 4.6 or higher).
-
Keyboard shortcuts for the rebase interactive view
-
Do not show "Rebase was aborted" dialog if the user pressed abort
-
[blame] Don’t open the History view automatically when showing annotations
-
Suppress bare repositories in RepositorySearchDialog
-
Make columns in Gitflow feature checkout dialog sortable
-
-
Performance
-
-
Speed up the IgnoreOperation
-
Speed up context menu in staging view
-
More efficient label provider for the staging view
-
Improve performance of StagingView a little
-
-
Releng
-
-
Update and improve Oomph setup for setting up Eclipse for JGit/EGit contributors.
Add hyperlinks to unified Diff Viewer to enable opening
+
Open the previous version in an editor
+
Open the workspace version (if it exists) in an editor
+
Open "this" version (i.e., the “current” one of the diff) in an editor
+
Open a two-way diff between the previous and this version in a compare editor
+
Turn the DiffEditorPage used to display unified diffs into a real TextEditor. This enables many standard text editor actions like "Find" or "Go to line".
+
Add an outline view for the diff tab of the Commit Viewer and enable text editor toolbar items
+
Handle rebase modes 'preserve' and 'interactive' in EGit
+
Introduce GitSynchronizer for logical model support
+
Make auto-staging of files being moved configurable
+
Make auto-staging of files being deleted configurable
+
Compare/ReplaceWithPrevious support for multiple resources (in mappings)
+
+
Usability Improvements
+
+
Show accurate progress reports for pull
+
Use "Revision Information" label in preferences and update job
+
Hide warning when reconfiguring upstream from local to remote branch
+
Suppress the "Interactive rebase has been prepared" dialog
+
Give focus to commit message when auto-staging is enabled
+
More configurable date formatting
+
Improve listing in "Report Bug or Enhancement" dialog
+
Use "Show Revision Information" instead of "Show Annotations"
+
Save and restore previously selected reset type
+
Show Git Staging view in Git Repositories view's Show In menu
+
Improve search implementation in RepositorySearchDialog
+
+
Performance Improvements
+
+
Fix that click on search result caused EGit to stat the repository directory
+
+
Build and Release Engineering
+
+
Change EGit minimum execution environment to JavaSE-1.8
+
Change EGit Github Client's minimum execution environment to JavaSE-1.8
+
Add Oxygen target platform, remove target platforms older than Mars
+
+
\ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.5/Bug-Fixes.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.6/Bug-Fixes.html
similarity index 80%
rename from org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.5/Bug-Fixes.html
rename to org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.6/Bug-Fixes.html
index 259466ab4..80ffb9109 100644
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.5/Bug-Fixes.html
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.6/Bug-Fixes.html
@@ -2,7 +2,7 @@
- EGit 4.5 New and Noteworthy - Bug Fixes
+ EGit 4.6 New and Noteworthy - Bug Fixes
@@ -12,7 +12,7 @@
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.5/Updating-This-Document.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.6/Updating-This-Document.html
similarity index 88%
rename from org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.5/Updating-This-Document.html
rename to org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.6/Updating-This-Document.html
index 57618e0a1..7947b5c79 100644
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.5/Updating-This-Document.html
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.6/Updating-This-Document.html
@@ -2,7 +2,7 @@
- EGit 4.5 New and Noteworthy - Updating This Document
+ EGit 4.6 New and Noteworthy - Updating This Document
@@ -29,7 +29,7 @@
Each line in .gitignore files defines a pattern. Git checks ignore patterns following the hierarchy of the working tree from highest to lowest. Patterns defined in higher level .gitignore files are overridden by those defined in lower levels.
Files which shall be ignored for all working on a given project are usually included in the project's repository to easily share them in the team.
lines starting with
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 acd495e48..c17106072 100644
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html
@@ -666,6 +666,10 @@
Finish, 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.
This allows for more flexibility when working with different Gerrit branches in parallel (e.g. frequently switching between development and hotfixing).
+
Pushing as Draft
+
The "refs/for" in the "Push to Gerrit" wizard is a combo drop-down box; click it and select "refs/drafts" instead of "refs/for" to
+ push a draft change to Gerrit.
+
Editing a change
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):
@@ -2493,24 +2497,27 @@ Sein oder nicht sein
-
+
Diff tab
-
Text viewer with the output of the file differences
-
The colors used in the viewer can be configured from the
+
Read-only text editor with the output of the file differences, with a content outline linked to the editor.
+
The colors used in the viewer for highlighting lines can be configured from the
Preferences >
General >
Appearance >
Colors and Fonts >
- Git folder
+ Git folder.
+
The overview ruler right of the editor's text viewer shows colored annotations for all added or removed lines.
+
Quick navigation between "hunks" (changes with added or removed lines) is available via clicking on an annotation in the overview ruler, or via the "Go To Next Annotation"/"Go To Previous Annotation" actions in the global Eclipse toolbar (default keyboard shortcuts are "Crtl/Cmd-." and "Shift-Ctrl/Cmd-.").
+
Line numbers in hunk headers, as well as the file names in file diff headers are hyperlinks to open the old or the new version or also the current working tree version in an editor, or to show a two-way diff between the old and the new version. The latter is also available on the word "diff" in a file diff headline (the one starting with "diff --git"). These links are only available if applicable; for instance there will be no link to open the old version for an added file since there was no old version in this case.
-
+
Notes tab
@@ -2520,7 +2527,7 @@ Sein oder nicht sein