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:
-
download the p2 repository for the latest EGit release (which includes the JGit artifacts) to a local folder, e.g. ~/egit-releases/updates-3.0, find the p2 repository URLs
- here and see
- mirroring artifacts for a way to download the repository
+
download the p2 repository for the latest EGit release (which includes the JGit artifacts) to a local folder, e.g. ~/egit-releases/updates-4.0, find the p2 repository URLs
+ here and download the p2 repository of the latest minor release (service releases don't change API) using the corresponding link in the last column of that table
-
in Eclipse click "Preferences > Plug-In Development > 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.
+
in Eclipse click "Preferences > Plug-In Development > API Baselines", click "Add Baseline..." and define a new baseline (e.g. egit-4.0) and point it to the local copy of the corresponding EGit p2 repository.
the API tools will then raise warning/errors for all detected problems and provide quick fixes helping to resolve these problems
see the
PDE API Tools User Guide for more details.
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 82f48a612..07512de75 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
@@ -30,7 +30,7 @@
Development IDE Configuration
-
Download and install "Eclipse for RCP and RAP Developers" from here, if you don't already have it:
+
Download and install the Eclipse package "Eclipse IDE for Eclipse Committers" or "Eclipse for RCP and RAP Developers" from here, if you don't already have it:
Choose the
- egit-<version>.target 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)
+ egit-<version>.target file matching the version of your Eclipse platform (e.g. 4.5 for Mars) and open it (this may take a while as it downloads the indexes of the p2 repositories the target platform refers to)
In the resulting editor, click on the
- Set as Target Platform link at the top right (this may also take a while)
+ Set as Target Platform link at the top right (this may also take a while since it downloads the dependencies)
After that, the workspace should build cleanly. If not, try Project > Clean... > All. If this also doesn't help open Preferences > Plug-In Development > Target Platform,
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 65cde4fda..05ce6d160 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
@@ -428,7 +428,7 @@ Unpacking objects: 100% (5/5), done.
To /tmp/other
* branch french -> french
* branch web -> web
-$ cd /tmp/other # Switch to 'other' repository
+$ cd /tmp/other # Switch to 'other' repository. git commands now apply to this repository
$ git config --bool core.bare false # need to allow this repository to have checked out files
$ ls # Nothing to be seen, but it's there
$ git branch
@@ -442,7 +442,7 @@ $ echo '<h1>Git rocks!</h1>' >> index.html
$ git commit -a -m "Added Git Rocks!"
510621a Added Git Rocks
1 files changed, 1 insertions(+), 0 deletions(-)
-$ cd /tmp/example # Back to first repo
+$ cd /tmp/example # Back to first repo. git commands now apply to 'example' repository
$ git pull other web # Pull changes from 'other' repo 'web' branch
remote: Counting objects: 5, done.
remote: Compressing objects: 100% (3/3), done.
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.0/4.0.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.0/4.0.html
deleted file mode 100644
index 9a4b0dc22..000000000
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.0/4.0.html
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
-
Introduce a merge strategy extension point which allows to plugin custom merge strategies. This will be used by EMF Compare to add support for merging models.
+
Staging View and Commit Dialog
+
+
Add check for build warnings and errors before commit. Optionally block commit if there are any problems reported
+
Make warning for non-empty second line of commit message optional
+
Consider initial selection in Staging View
+
Improve Staging View to remember position of its components
+
Introduce compare mode for Git Staging View similar to History View
+
+
History View
+
+
Rewrite CommitMessageViewer to use JFace
+
Simplify hyperlink syntax coloring
+
Use standard hyperlink link colors
+
+
Repositories View
+
+
Decorate repository in Repositories View if working tree is dirty
+
Use decoration color to render dirty decorator in repositories view
+
Improve sorting of nodes in Repositories View
+
+
Other Enhancements
+
+
Auto-configure Gerrit after ssh clone
+
Add "Compare with/Replace with" actions to ResourceMappings
+
Use the default repository folder when importing Team project sets
+
Consider initial selection in Interactive Rebase view
+
+
Gitflow Support
+
+
Allow changing branch names when initializing a Gitflow repository
+
Add icon decorations to identify gitflow repositories
+
Allow changing the commit message during feature finish with squash option
+
Implement squash and keep branch options for feature finish
+
+
Performance Improvements
+
+
Do not iterate over all staged view entries if not needed
+
Add default limit for number of shown diff lines in history
+
+
Release Engineering and Build
+
+
Update swtbot to 2.3.0
+
Update org.apache.httpcomponents used by JGit to 4.3
+
+
\ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.0/Bug-Fixes.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.1/Bug-Fixes.html
similarity index 78%
rename from org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.0/Bug-Fixes.html
rename to org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.1/Bug-Fixes.html
index a473c9da3..5acbf4afa 100644
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.0/Bug-Fixes.html
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.1/Bug-Fixes.html
@@ -2,7 +2,7 @@
- EGit 4.0 New and Noteworthy - Bug Fixes
+ EGit 4.1 New and Noteworthy - Bug Fixes
@@ -12,7 +12,7 @@
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.0/Contributors.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.1/Contributors.html
similarity index 81%
rename from org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.0/Contributors.html
rename to org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.1/Contributors.html
index ebd382e83..1a74fa323 100644
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.0/Contributors.html
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.1/Contributors.html
@@ -2,7 +2,7 @@
- EGit 4.0 New and Noteworthy - Contributors
+ EGit 4.1 New and Noteworthy - Contributors
@@ -30,28 +30,29 @@
Contributors
-
The following 21 developers worked on this release:
+
The following 22 developers worked on this release:
Andrey Loskutov,
+ Chris Price,
Christian Georgi,
- Christian Halstrick,
- Chris Rebert,
Dani Megert,
- Erwin van Eyk,
- Fabio Zadrozny,
- Gunnar Wagenknecht,
+ Denis Zygann,
+ Jan-Ove Weichel,
+ Joachim Käßer,
Jon Ander Peñalba,
- Kyle J. Harms,
+ Karsten Panier,
Lars Vogel,
Laurent Delaigue,
- Laurent Goubet,
- Markus Keller,
Matthias Sohn,
+ Markus Keller,
Max Hohenegger,
- Michael Mathews,
- Michael Keppler,
- Mickael Istria,
- Radim Hopp,
- rnveach
+ Mykola Nikishov,
+ Pawel Nowak,
+ Peter Karena,
+ Philipp Bumann,
+ Stefan Dirix,
+ Thomas Wolf,
+ Tobias Baumann,
+ Wayne Beaton
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.1/Updating-This-Document.html
similarity index 87%
rename from org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.0/Updating-This-Document.html
rename to org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.1/Updating-This-Document.html
index bb6ac72dd..c50a5541d 100644
--- 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.1/Updating-This-Document.html
@@ -2,7 +2,7 @@
- EGit 4.0 New and Noteworthy - Updating This Document
+ EGit 4.1 New and Noteworthy - Updating This Document
@@ -29,7 +29,7 @@
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 db94b0b0c..99d626a55 100644
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html
@@ -718,15 +718,30 @@
http://nvie.com/posts/a-successful-git-branching-model/), EGit allows you to work with Gitflow operations, managing feature, release and hotfix branches.
Enabling Gitflow for a repository
-
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
+
Gitflow operations 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.
+
+
+
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.
+
Starting release from a commit other than HEAD
+
Go to the EGit History view, and right-click the commit you want to start the release from.
+ In the context menu, go to
+ Git Flow, and select
+ Start release from commit <sha1>.
+
+
+
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.
Open the Eclipse
- Preferences and ensure that your SSH2 home is configured correctly (usually this is ~/.ssh) and contains your SSH2 keys:
+ Preferences. Navigate to and expand the Network Connections option and select SSH. Ensure that your SSH2 home is configured correctly (usually this is ~/.ssh) and contains your SSH2 keys:
Push certificates are used to verify the pusher's identity when a git server receives a signed pack
+
Parsing of push certificates
+
Storage of push certificates, they are stored in a special ref "refs/meta/push-certs". The filenames in the tree are ref names followed by the special suffix "cert", and the contents are the latest push cert affecting that ref.
+
Configuration for server-side signed push verification
+
Support for push certificates in BaseReceivePack and RefUpdate
+
+
Ignore Handling
+
+
Allow leading/trailing spaces in ignore rules
+
Allow leading literal '#' and '!' in ignore rules if they are escaped
+
Don't trim trailing space if it is escaped with backslash
+
+
Other Enhancements
+
+
Add setTargetBranch in RepoCommand.
+
Add API to remove repositories from RepositoryCache
+
Add new submodule layout to SubmoduleAddCommand
+
Handle stale NFS file handles on packed-refs file
+
Add a grace period for packfiles during GC so that they are retained during GC until configured expiration age is reached
+
+
Performance Improvements
+
+
Use java.io.File instead of NIO to check existence of loose objects in ObjectDirectory to speed up inserting of loose objects
+
Reduce memory consumption when creating bitmaps during writing pack files
+
+
\ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.0/Bug-Fixes.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.1/Bug-Fixes.html
similarity index 78%
rename from org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.0/Bug-Fixes.html
rename to org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.1/Bug-Fixes.html
index 601bb84ea..8981eaf57 100644
--- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.0/Bug-Fixes.html
+++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.1/Bug-Fixes.html
@@ -2,7 +2,7 @@
- JGit 4.0 New and Noteworthy - Bug Fixes
+ JGit 4.1 New and Noteworthy - Bug Fixes
@@ -12,7 +12,7 @@
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.0/Contributors.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.1/Contributors.html
similarity index 83%
rename from org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.0/Contributors.html
rename to org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.1/Contributors.html
index 882a9cad0..aca519c55 100644
--- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.0/Contributors.html
+++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.1/Contributors.html
@@ -2,7 +2,7 @@
- JGit 4.0 New and Noteworthy - Contributors
+ JGit 4.1 New and Noteworthy - Contributors
@@ -30,26 +30,22 @@
Contributors
-
The following 20 developers worked on this release of JGit :
+
The following 16 developers worked on this release of JGit :
Andrey Loskutov,
- André de Oliveira,
+ Chris Price,
Christian Halstrick,
Dave Borowitz,
- David Ostrovsky,
David Pletcher,
- Hector Oswaldo Caballero,
+ Fredrik Medley,
Hugo Arès,
+ Jacob Keller,
Jonathan Nieder,
- Kaloyan Raev,
- Laurent Delaigue,
- Markus Duft,
- Matthew Spurrier,
+ Martin Fick,
Matthias Sohn,
- Saša Živkov,
- Sebastian Schuberth,
+ Patrick Steinhardt,
Shawn Pearce,
- Stefan Beller,
Terry Parker,
+ Tobias Oberlies,
Yuxuan 'fishy' Wang
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.1/Updating-This-Document.html
similarity index 87%
rename from org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.0/Updating-This-Document.html
rename to org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.1/Updating-This-Document.html
index 9e937c231..907bc748e 100644
--- 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.1/Updating-This-Document.html
@@ -2,7 +2,7 @@
- JGit 4.0 New and Noteworthy - Updating This Document
+ JGit 4.1 New and Noteworthy - Updating This Document
@@ -29,7 +29,7 @@