Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2015-09-27 18:59:01 -0400
committerMatthias Sohn2015-09-27 18:59:01 -0400
commitc12a9d7f41682491b16e79fc4f436c72518eed19 (patch)
tree8c891eaa1e50ad27fdac3467c4a178e55525ffa1
parentfcb1b730f76867864c420beabe7dbbd57e9b33f7 (diff)
downloadegit-c12a9d7f41682491b16e79fc4f436c72518eed19.tar.gz
egit-c12a9d7f41682491b16e79fc4f436c72518eed19.tar.xz
egit-c12a9d7f41682491b16e79fc4f436c72518eed19.zip
Update documentation for 4.1
Change-Id: Ib99e39c12b09b2731faef591d323542b89b583ba Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.egit.doc/build-help.xml4
-rw-r--r--org.eclipse.egit.doc/help/EGit/Contributor_Guide/Bugs.html27
-rw-r--r--org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html7
-rw-r--r--org.eclipse.egit.doc/help/EGit/Contributor_Guide/Development-IDE-Configuration.html8
-rw-r--r--org.eclipse.egit.doc/help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html4
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.0/4.0.html93
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.1/4.1.html95
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.1/Bug-Fixes.html (renamed from org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.0/Bug-Fixes.html)16
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.1/Contributors.html (renamed from org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.0/Contributors.html)35
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.1/Updating-This-Document.html (renamed from org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.0/Updating-This-Document.html)8
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html19
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/User-Guide.html2
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-4.0-git_flow-repository_node_right_click.pngbin0 -> 529 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-4.0-git_flow_init-repository_node_right_click.pngbin0 -> 503 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-4.0-git_flow_start_release_from_history_view_context_menu.pngbin0 -> 1927 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-4.0-git_flow_submenu-repository_node_right_click.pngbin0 -> 2357 bytes
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.0/4.0.html105
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.1/4.1.html79
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.1/Bug-Fixes.html (renamed from org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.0/Bug-Fixes.html)16
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.1/Contributors.html (renamed from org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.0/Contributors.html)24
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.1/Updating-This-Document.html (renamed from org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.0/Updating-This-Document.html)8
-rw-r--r--org.eclipse.egit.doc/help/toc.xml54
22 files changed, 305 insertions, 299 deletions
diff --git a/org.eclipse.egit.doc/build-help.xml b/org.eclipse.egit.doc/build-help.xml
index e480f4518..2e889e1da 100644
--- a/org.eclipse.egit.doc/build-help.xml
+++ b/org.eclipse.egit.doc/build-help.xml
@@ -47,8 +47,8 @@
>
<path name="EGit/User_Guide" title="EGit User Guide" />
<path name="JGit/User_Guide" title="JGit User Guide" />
- <path name="EGit/New_and_Noteworthy/4.0" title="EGit 4.0 New and Noteworthy" />
- <path name="JGit/New_and_Noteworthy/4.0" title="JGit 4.0 New and Noteworthy" />
+ <path name="EGit/New_and_Noteworthy/4.1" title="EGit 4.1 New and Noteworthy" />
+ <path name="JGit/New_and_Noteworthy/4.1" title="JGit 4.1 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" />
diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Bugs.html b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Bugs.html
index 7877a825e..d6cfb9e2c 100644
--- a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Bugs.html
+++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Bugs.html
@@ -39,12 +39,27 @@
</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>
+ <h4 id="How_to_file_bugs">How to file bugs</h4>
+ <ul>
+ <li>
+ <a href="http://wiki.eclipse.org/FAQ_How_do_I_report_a_bug_in_Eclipse%3F" title="FAQ_How_do_I_report_a_bug_in_Eclipse%3F" target="egit_external">How do I report a bug in Eclipse?</a>
+ </li>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/page.cgi?id=bug-writing.html" target="egit_external">Bug Writing Guidelines</a>
+ </li>
+ <li>
+ <a href="http://www.chiark.greenend.org.uk/~sgtatham/bugs.html" target="egit_external">How to Report Bugs Effectively</a> by Simon Tatham
+ </li>
+ </ul>
+ <h4 id="File_a_bug">File a bug</h4>
+ <ul>
+ <li>
+ <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>
+ </li>
+ <li>
+ <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>
+ </li>
+ </ul>
<h3 id="Bug_Reports_and_Links">Bug Reports and Links</h3>
<table border="1" cellpadding="3" cellspacing="0">
<tr>
diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html
index c63a36cbb..6d07ef215 100644
--- a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html
+++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html
@@ -136,11 +136,10 @@
<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>download the p2 repository for the latest EGit release (which includes the JGit artifacts) to a local folder, e.g. <code>~/egit-releases/updates-4.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 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
</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>in Eclipse click "Preferences &gt; Plug-In Development &gt; 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.</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.
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 @@
</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>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:</p>
<p>
<a href="http://www.eclipse.org/downloads/" target="egit_external">http://www.eclipse.org/downloads/</a>
</p>
@@ -71,7 +71,7 @@
</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>
+ <h3 id="Option_1_.28recommended.29:_Use_a_Target_Platform">Option 1 (recommended): 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>
@@ -81,10 +81,10 @@
<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)
+ <i>egit-&lt;version&gt;.target</i> 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)
</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)
+ <i>Set as Target Platform</i> link at the top right (this may also take a while since it downloads the dependencies)
</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,
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
* <a href="new">branch</a> french -&gt; french
* <a href="new">branch</a> web -&gt; 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 '&lt;h1&gt;Git rocks!&lt;/h1&gt;' &gt;&gt; index.html
$ git commit -a -m "Added Git Rocks!"
<a href="web">510621a</a> 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 @@
-<?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 4.0 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 4.0 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>Extend EGit to support git-flow
- <a href="1">1</a> to automate git branching workflow
- </li>
- <li>Introduce internal API to integrate Team merging to prepare support for model merge</li>
- <li>Wizard for invoking automated project import</li>
- <li>Prevent Git Staging view to lose data when precommit hook aborts commit</li>
- <li>Show message dialog when hook aborts commit</li>
- <li>Java templates variables for Git config variables</li>
- </ul>
- <p>
- <a href="1">1</a>
- <a href="http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow/" target="egit_external">http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow/</a>
- </p>
- <h2 id="Usability_Improvements">Usability Improvements</h2>
- <ul>
- <li>Sort branches in "Push to Gerrit" wizard case insensitive</li>
- <li>Automatic wildcard matching in "Add Git repositories" dialog</li>
- <li>Make PushResultDialog non-modal</li>
- <li>Properly style PushResultDialog in dark theme</li>
- <li>Fix styling of staging view and commit dialog for dark theme</li>
- <li>Add interactive rebase tooltip descriptions</li>
- <li>Raise warning if second line of commit message isn't empty</li>
- <li>Add sash to PushResultTable to allow resizing text field used to display push message</li>
- <li>Avoid blinking cursor in merge result dialog</li>
- <li>Accept git clone command as URI in clone wizard</li>
- <li>Close commit editor after deleting stash</li>
- <li>Consider different users and repo suffixes in project import</li>
- <li>Make welcome page contribution more consistent</li>
- </ul>
- <h2 id="Performance_Improvements">Performance Improvements</h2>
- <ul>
- <li>Use image descriptors cache for external programs</li>
- <li>Optimizations for GitResourceDeltaVisitor visit()</li>
- <li>Fix ResourceUtil performance on big repositories/workspaces</li>
- <li>Allow to switch the branch sequence off in the commit message viewer</li>
- </ul>
- <h2 id="Build_and_release_engineering">Build and release engineering</h2>
- <ul>
- <li>Update minimum required Java version to Java 7</li>
- <li>Update build to use eclipse-jarsigner-plugin 1.1.2</li>
- <li>Update to Jetty 9.2.10</li>
- <li>Update to javax.servlet 3.1</li>
- <li>Oomph configuration to setup Eclipse for EGit contributors</li>
- <li>Update build to use Tycho 0.23.0</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/4.1/4.1.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.1/4.1.html
new file mode 100644
index 000000000..f406f8a26
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.1/4.1.html
@@ -0,0 +1,95 @@
+<?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 4.1 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 4.1 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="Merge_Strategy_Extension_Point">Merge Strategy Extension Point</h2>
+ <p>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.</p>
+ <h2 id="Staging_View_and_Commit_Dialog">Staging View and Commit Dialog</h2>
+ <ul>
+ <li>Add check for build warnings and errors before commit. Optionally block commit if there are any problems reported</li>
+ <li>Make warning for non-empty second line of commit message optional</li>
+ <li>Consider initial selection in Staging View</li>
+ <li>Improve Staging View to remember position of its components</li>
+ <li>Introduce compare mode for Git Staging View similar to History View</li>
+ </ul>
+ <h2 id="History_View">History View</h2>
+ <ul>
+ <li>Rewrite CommitMessageViewer to use JFace</li>
+ <li>Simplify hyperlink syntax coloring</li>
+ <li>Use standard hyperlink link colors</li>
+ </ul>
+ <h2 id="Repositories_View">Repositories View</h2>
+ <ul>
+ <li>Decorate repository in Repositories View if working tree is dirty</li>
+ <li>Use decoration color to render dirty decorator in repositories view</li>
+ <li>Improve sorting of nodes in Repositories View</li>
+ </ul>
+ <h2 id="Other_Enhancements">Other Enhancements</h2>
+ <ul>
+ <li>Auto-configure Gerrit after ssh clone</li>
+ <li>Add "Compare with/Replace with" actions to ResourceMappings</li>
+ <li>Use the default repository folder when importing Team project sets</li>
+ <li>Consider initial selection in Interactive Rebase view</li>
+ </ul>
+ <h2 id="Gitflow_Support">Gitflow Support</h2>
+ <ul>
+ <li>Allow changing branch names when initializing a Gitflow repository</li>
+ <li>Add icon decorations to identify gitflow repositories</li>
+ <li>Allow changing the commit message during feature finish with squash option</li>
+ <li>Implement squash and keep branch options for feature finish</li>
+ </ul>
+ <h2 id="Performance_Improvements">Performance Improvements</h2>
+ <ul>
+ <li>Do not iterate over all staged view entries if not needed</li>
+ <li>Add default limit for number of shown diff lines in history</li>
+ </ul>
+ <h2 id="Release_Engineering_and_Build">Release Engineering and Build</h2>
+ <ul>
+ <li>Update swtbot to 2.3.0</li>
+ <li>Update org.apache.httpcomponents used by JGit to 4.3</li>
+ <li>Stabilize unstable UI tests</li>
+ <li>Add Gitflow UI tests</li>
+ <li>Enable NPE analysis in EGit</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/4.0/Bug-Fixes.html b/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 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>EGit 4.0 New and Noteworthy - Bug Fixes</title>
+ <title>EGit 4.1 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="4.0.html" title="EGit 4.0 New and Noteworthy">
+ <a href="4.1.html" title="EGit 4.1 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 4.0 New and Noteworthy</td>
+ <td style="width: 20%" align="left" valign="top">EGit 4.1 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;list_id=10006180&amp;order=Importance&amp;product=EGit&amp;query_format=advanced&amp;target_milestone=4.0" target="egit_external">40 Bugs and 5 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=4.1" target="egit_external">47 Bugs and 17 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="4.0.html" title="EGit 4.0 New and Noteworthy">
+ <a href="4.1.html" title="EGit 4.1 New and Noteworthy">
<img alt="Previous" border="0" src="../../../images/prev.gif"/>
</a>
</td>
<td style="width: 60%" align="center">
- <a href="4.0.html" title="EGit 4.0 New and Noteworthy">
- <img alt="EGit 4.0 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ <a href="4.1.html" title="EGit 4.1 New and Noteworthy">
+ <img alt="EGit 4.1 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 4.0 New and Noteworthy</td>
+ <td style="width: 20%" align="left" valign="top">EGit 4.1 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/4.0/Contributors.html b/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 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>EGit 4.0 New and Noteworthy - Contributors</title>
+ <title>EGit 4.1 New and Noteworthy - Contributors</title>
<link type="text/css" rel="stylesheet" href="../../../book.css"/>
</head>
<body>
@@ -30,28 +30,29 @@
</tr>
</table><hr/>
<h1 id="Contributors">Contributors</h1>
- <p>The following 21 developers worked on this release:</p>
+ <p>The following 22 developers worked on this release:</p>
<p>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</p><hr/>
+ Mykola Nikishov,
+ Pawel Nowak,
+ Peter Karena,
+ Philipp Bumann,
+ Stefan Dirix,
+ Thomas Wolf,
+ Tobias Baumann,
+ Wayne Beaton</p><hr/>
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
<tr>
<td style="width: 20%" align="left">
@@ -60,8 +61,8 @@
</a>
</td>
<td style="width: 60%" align="center">
- <a href="4.0.html" title="EGit 4.0 New and Noteworthy">
- <img alt="EGit 4.0 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ <a href="4.1.html" title="EGit 4.1 New and Noteworthy">
+ <img alt="EGit 4.1 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/4.0/Updating-This-Document.html b/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 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>EGit 4.0 New and Noteworthy - Updating This Document</title>
+ <title>EGit 4.1 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/4.0" target="egit_external">http://wiki.eclipse.org/EGit/New_and_Noteworthy/4.0</a>
+ <a href="http://wiki.eclipse.org/EGit/New_and_Noteworthy/4.1" target="egit_external">http://wiki.eclipse.org/EGit/New_and_Noteworthy/4.1</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="4.0.html" title="EGit 4.0 New and Noteworthy">
- <img alt="EGit 4.0 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ <a href="4.1.html" title="EGit 4.1 New and Noteworthy">
+ <img alt="EGit 4.1 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/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 @@
<a href="http://nvie.com/posts/a-successful-git-branching-model/" target="egit_external">http://nvie.com/posts/a-successful-git-branching-model/</a>), EGit allows you to work with Gitflow operations, managing feature, release and hotfix branches.
</p>
<h3 id="Enabling_Gitflow_for_a_repository">Enabling Gitflow for a repository</h3>
- <p>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
+ <p>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
<b>Init Git Flow</b>.
- You can skip this step, if your repository was already configured for Gitflow by another client.
+
+ <img border="0" src="images/Egit-4.0-git_flow_init-repository_node_right_click.png"/>
</p>
+ <p>You can skip this step if your repository was already configured for Gitflow by another client.</p>
<h3 id="Starting_a_feature.2Frelease.2Fhotfix">Starting a feature/release/hotfix</h3>
<p>Right-click on a repository, select
<b>Git Flow</b>, and select the appropriate start command.
</p>
+ <p>
+ <img border="0" src="images/Egit-4.0-git_flow-repository_node_right_click.png"/>
+
+ <img border="0" src="images/Egit-4.0-git_flow_submenu-repository_node_right_click.png"/>
+ </p>
<p>A dialog will appear that lets you enter a name for the Gitflow branch, adding the correct prefix automatically.</p>
+ <h3 id="Starting_release_from_a_commit_other_than_HEAD">Starting release from a commit other than HEAD</h3>
+ <p>Go to the EGit History view, and right-click the commit you want to start the release from.
+ In the context menu, go to
+ <b>Git Flow</b>, and select
+ <b>Start release from commit &lt;sha1&gt;</b>.
+
+ <img border="0" src="images/Egit-4.0-git_flow_start_release_from_history_view_context_menu.png"/>
+ </p>
<h2 id="Inspecting_the_state_of_the_Repository">Inspecting the state of the Repository</h2>
<h3 id="Label_Decorations">Label Decorations</h3>
<p>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.</p>
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 566b93bd0..58310836f 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
@@ -268,7 +268,7 @@
<h3 id="Eclipse_SSH_Configuration">Eclipse SSH Configuration</h3>
<ul>
<li>Open the Eclipse
- <b>Preferences</b> and ensure that your SSH2 home is configured correctly (usually this is <tt>~/.ssh</tt>) and contains your SSH2 keys:
+ <b>Preferences</b>. Navigate to and expand the Network Connections option and select SSH. Ensure that your SSH2 home is configured correctly (usually this is <tt>~/.ssh</tt>) and contains your SSH2 keys:
</li>
</ul>
<p>
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-4.0-git_flow-repository_node_right_click.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-4.0-git_flow-repository_node_right_click.png
new file mode 100644
index 000000000..118fd5a0e
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-4.0-git_flow-repository_node_right_click.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-4.0-git_flow_init-repository_node_right_click.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-4.0-git_flow_init-repository_node_right_click.png
new file mode 100644
index 000000000..b525beaf2
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-4.0-git_flow_init-repository_node_right_click.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-4.0-git_flow_start_release_from_history_view_context_menu.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-4.0-git_flow_start_release_from_history_view_context_menu.png
new file mode 100644
index 000000000..3a3eec495
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-4.0-git_flow_start_release_from_history_view_context_menu.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-4.0-git_flow_submenu-repository_node_right_click.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-4.0-git_flow_submenu-repository_node_right_click.png
new file mode 100644
index 000000000..555e36ce1
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-4.0-git_flow_submenu-repository_node_right_click.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.0/4.0.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.0/4.0.html
deleted file mode 100644
index 4e092a6f8..000000000
--- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.0/4.0.html
+++ /dev/null
@@ -1,105 +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>JGit 4.0 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 4.0 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="JGit">JGit</h1>
- <h2 id="Update_to_Java_7">Update to Java 7</h2>
- <ul>
- <li>Update minimum required Java version from Java 5 to Java 7</li>
- <li>Remove bundles org.eclipse.jgit.console and org.eclipse.jgit.java7 which are no longer needed due to update to Java 7</li>
- <li>Implement AutoClosable and use it to ensure resource held by JGit get released when they are no longer needed</li>
- </ul>
- <h2 id="API_cleanup">API cleanup</h2>
- <ul>
- <li>Replace release() methods by close() to support AutoClosable</li>
- <li>Delete some deprecated classes and methods, details are available in Clirr API change report</li>
- <li>ObjectReader: remove the walkAdvice API</li>
- </ul>
- <h2 id="Configuration">Configuration</h2>
- <ul>
- <li>Remove the gitprefix logic and rework detecting Git system config file</li>
- <li>Allow to manually set the path to the Git system config file</li>
- <li>Add fsck.allowInvalidPersonIdent to accept invalid author/committers</li>
- </ul>
- <h2 id="Protocol">Protocol</h2>
- <ul>
- <li>Add support for quiet capability to ReceivePack</li>
- <li>Support agent= capability in wire protocol</li>
- </ul>
- <h2 id="Hooks">Hooks</h2>
- <ul>
- <li>Support for the commit-msg hook</li>
- </ul>
- <h2 id="Misc._Enhancements">Misc. Enhancements</h2>
- <ul>
- <li>Allow ObjectWalk to be filtered by an arbitrary predicate</li>
- <li>Use ANY_DIFF filter in ResolveMerger for bare repositories</li>
- <li>ObjectWalk: make setRetainBody(false) the default</li>
- <li>Make MyersDiff interruptible</li>
- <li>Support --untracked-files in command line status command</li>
- <li>Support "--long" option in DescribeCommand and command line describe command</li>
- <li>Make s3 domain dynamic to support different s3 regions in AmazonS3 transport</li>
- <li>Allow public access to PackIndex</li>
- <li>Enhance ArchiveCommand to allow passing options to underlying stream</li>
- </ul>
- <h2 id="Introduce_logging">Introduce logging</h2>
- <ul>
- <li>Use slf4j API to enable logging in JGit</li>
- <li>Use log4j-slf4j to log from org.eclipse.jgit.pgm</li>
- </ul>
- <h2 id="Performance_Improvements">Performance Improvements</h2>
- <ul>
- <li>Optimize EolAwareOutputStream for bulk output</li>
- <li>Buffer TemporaryBuffer's overflow output stream used by ResolveMerger to improve performance</li>
- <li>RevWalk: Discard uninteresting commits unless RevSort.BOUNDARY</li>
- </ul>
- <h2 id="Build_and_release_engineering">Build and release engineering</h2>
- <ul>
- <li>Update build to use eclipse-jarsigner-plugin 1.1.2</li>
- <li>Update build to use Tycho 0.23.0</li>
- <li>Update all standard maven plugins to latest versions</li>
- <li>Update to Jetty 9.2.10</li>
- <li>Update to javax.servlet 3.1</li>
- <li>Added more reports to Maven site</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/4.1/4.1.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.1/4.1.html
new file mode 100644
index 000000000..daab83c06
--- /dev/null
+++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.1/4.1.html
@@ -0,0 +1,79 @@
+<?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>JGit 4.1 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 4.1 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="JGit">JGit</h1>
+ <h2 id="Basic_Support_for_Push_Certificates">Basic Support for Push Certificates</h2>
+ <ul>
+ <li>Push certificates are used to verify the pusher's identity when a git server receives a signed pack</li>
+ <li>Parsing of push certificates</li>
+ <li>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.</li>
+ <li>Configuration for server-side signed push verification</li>
+ <li>Support for push certificates in BaseReceivePack and RefUpdate</li>
+ </ul>
+ <h2 id="Ignore_Handling">Ignore Handling</h2>
+ <ul>
+ <li>Allow leading/trailing spaces in ignore rules</li>
+ <li>Allow leading literal '#' and '!' in ignore rules if they are escaped</li>
+ <li>Don't trim trailing space if it is escaped with backslash</li>
+ </ul>
+ <h2 id="Other_Enhancements">Other Enhancements</h2>
+ <ul>
+ <li>Add setTargetBranch in RepoCommand.</li>
+ <li>Add API to remove repositories from RepositoryCache</li>
+ <li>Add new submodule layout to SubmoduleAddCommand</li>
+ <li>Handle stale NFS file handles on packed-refs file</li>
+ <li>Add a grace period for packfiles during GC so that they are retained during GC until configured expiration age is reached</li>
+ </ul>
+ <h2 id="Performance_Improvements">Performance Improvements</h2>
+ <ul>
+ <li>Use java.io.File instead of NIO to check existence of loose objects in ObjectDirectory to speed up inserting of loose objects</li>
+ <li>Reduce memory consumption when creating bitmaps during writing pack files</li>
+ </ul>
+ <h2 id="Build_and_Release_Engineering">Build and Release Engineering</h2>
+ <ul>
+ <li>Enable annotation based NPE analysis in jgit</li>
+ <li>Update Jetty to 9.2.13.v20150730</li>
+ <li>Update org.apache.httpcomponents to 4.3</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/4.0/Bug-Fixes.html b/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 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>JGit 4.0 New and Noteworthy - Bug Fixes</title>
+ <title>JGit 4.1 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="4.0.html" title="JGit 4.0 New and Noteworthy">
+ <a href="4.1.html" title="JGit 4.1 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 4.0 New and Noteworthy</td>
+ <td style="width: 20%" align="left" valign="top">JGit 4.1 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?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=4.0" target="egit_external">10 Bugs and 1 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=4.1" target="egit_external">11 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="4.0.html" title="JGit 4.0 New and Noteworthy">
+ <a href="4.1.html" title="JGit 4.1 New and Noteworthy">
<img alt="Previous" border="0" src="../../../images/prev.gif"/>
</a>
</td>
<td style="width: 60%" align="center">
- <a href="4.0.html" title="JGit 4.0 New and Noteworthy">
- <img alt="JGit 4.0 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ <a href="4.1.html" title="JGit 4.1 New and Noteworthy">
+ <img alt="JGit 4.1 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 4.0 New and Noteworthy</td>
+ <td style="width: 20%" align="left" valign="top">JGit 4.1 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/4.0/Contributors.html b/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 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>JGit 4.0 New and Noteworthy - Contributors</title>
+ <title>JGit 4.1 New and Noteworthy - Contributors</title>
<link type="text/css" rel="stylesheet" href="../../../book.css"/>
</head>
<body>
@@ -30,26 +30,22 @@
</tr>
</table><hr/>
<h1 id="Contributors">Contributors</h1>
- <p>The following 20 developers worked on this release of JGit :</p>
+ <p>The following 16 developers worked on this release of JGit :</p>
<p>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</p><hr/>
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
<tr>
@@ -59,8 +55,8 @@
</a>
</td>
<td style="width: 60%" align="center">
- <a href="4.0.html" title="JGit 4.0 New and Noteworthy">
- <img alt="JGit 4.0 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ <a href="4.1.html" title="JGit 4.1 New and Noteworthy">
+ <img alt="JGit 4.1 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/4.0/Updating-This-Document.html b/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 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>JGit 4.0 New and Noteworthy - Updating This Document</title>
+ <title>JGit 4.1 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/4.0" target="egit_external">http://wiki.eclipse.org/JGit/New_and_Noteworthy/4.0</a>
+ <a href="http://wiki.eclipse.org/JGit/New_and_Noteworthy/4.1" target="egit_external">http://wiki.eclipse.org/JGit/New_and_Noteworthy/4.1</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="4.0.html" title="JGit 4.0 New and Noteworthy">
- <img alt="JGit 4.0 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ <a href="4.1.html" title="JGit 4.1 New and Noteworthy">
+ <img alt="JGit 4.1 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/toc.xml b/org.eclipse.egit.doc/help/toc.xml
index 22af51faa..cf38e0a7a 100644
--- a/org.eclipse.egit.doc/help/toc.xml
+++ b/org.eclipse.egit.doc/help/toc.xml
@@ -102,6 +102,7 @@
<topic href="help/EGit/User_Guide/Tasks.html#Working_with_Gitflow" label="Working with Gitflow">
<topic href="help/EGit/User_Guide/Tasks.html#Enabling_Gitflow_for_a_repository" label="Enabling Gitflow for a repository"></topic>
<topic href="help/EGit/User_Guide/Tasks.html#Starting_a_feature.2Frelease.2Fhotfix" label="Starting a feature/release/hotfix"></topic>
+ <topic href="help/EGit/User_Guide/Tasks.html#Starting_release_from_a_commit_other_than_HEAD" label="Starting release from a commit other than HEAD"></topic>
</topic>
<topic href="help/EGit/User_Guide/Tasks.html#Inspecting_the_state_of_the_Repository" label="Inspecting the state of the Repository">
<topic href="help/EGit/User_Guide/Tasks.html#Label_Decorations" label="Label Decorations">
@@ -441,32 +442,32 @@
</topic>
<topic href="help/JGit/User_Guide/Updating-This-Document.html" label="Updating This Document"></topic>
</topic>
- <topic href="help/EGit/New_and_Noteworthy/4.0/4.0.html" label="EGit 4.0 New and Noteworthy">
- <topic href="help/EGit/New_and_Noteworthy/4.0/4.0.html" label="EGit">
- <topic href="help/EGit/New_and_Noteworthy/4.0/4.0.html#Features" label="Features"></topic>
- <topic href="help/EGit/New_and_Noteworthy/4.0/4.0.html#Usability_Improvements" label="Usability Improvements"></topic>
- <topic href="help/EGit/New_and_Noteworthy/4.0/4.0.html#Performance_Improvements" label="Performance Improvements"></topic>
- <topic href="help/EGit/New_and_Noteworthy/4.0/4.0.html#Build_and_release_engineering" label="Build and release engineering"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/4.1/4.1.html" label="EGit 4.1 New and Noteworthy">
+ <topic href="help/EGit/New_and_Noteworthy/4.1/4.1.html" label="EGit">
+ <topic href="help/EGit/New_and_Noteworthy/4.1/4.1.html#Merge_Strategy_Extension_Point" label="Merge Strategy Extension Point"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/4.1/4.1.html#Staging_View_and_Commit_Dialog" label="Staging View and Commit Dialog"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/4.1/4.1.html#History_View" label="History View"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/4.1/4.1.html#Repositories_View" label="Repositories View"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/4.1/4.1.html#Other_Enhancements" label="Other Enhancements"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/4.1/4.1.html#Gitflow_Support" label="Gitflow Support"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/4.1/4.1.html#Performance_Improvements" label="Performance Improvements"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/4.1/4.1.html#Release_Engineering_and_Build" label="Release Engineering and Build"></topic>
</topic>
- <topic href="help/EGit/New_and_Noteworthy/4.0/Bug-Fixes.html" label="Bug Fixes"></topic>
- <topic href="help/EGit/New_and_Noteworthy/4.0/Contributors.html" label="Contributors"></topic>
- <topic href="help/EGit/New_and_Noteworthy/4.0/Updating-This-Document.html" label="Updating This Document"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/4.1/Bug-Fixes.html" label="Bug Fixes"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/4.1/Contributors.html" label="Contributors"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/4.1/Updating-This-Document.html" label="Updating This Document"></topic>
</topic>
- <topic href="help/JGit/New_and_Noteworthy/4.0/4.0.html" label="JGit 4.0 New and Noteworthy">
- <topic href="help/JGit/New_and_Noteworthy/4.0/4.0.html" label="JGit">
- <topic href="help/JGit/New_and_Noteworthy/4.0/4.0.html#Update_to_Java_7" label="Update to Java 7"></topic>
- <topic href="help/JGit/New_and_Noteworthy/4.0/4.0.html#API_cleanup" label="API cleanup"></topic>
- <topic href="help/JGit/New_and_Noteworthy/4.0/4.0.html#Configuration" label="Configuration"></topic>
- <topic href="help/JGit/New_and_Noteworthy/4.0/4.0.html#Protocol" label="Protocol"></topic>
- <topic href="help/JGit/New_and_Noteworthy/4.0/4.0.html#Hooks" label="Hooks"></topic>
- <topic href="help/JGit/New_and_Noteworthy/4.0/4.0.html#Misc._Enhancements" label="Misc. Enhancements"></topic>
- <topic href="help/JGit/New_and_Noteworthy/4.0/4.0.html#Introduce_logging" label="Introduce logging"></topic>
- <topic href="help/JGit/New_and_Noteworthy/4.0/4.0.html#Performance_Improvements" label="Performance Improvements"></topic>
- <topic href="help/JGit/New_and_Noteworthy/4.0/4.0.html#Build_and_release_engineering" label="Build and release engineering"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/4.1/4.1.html" label="JGit 4.1 New and Noteworthy">
+ <topic href="help/JGit/New_and_Noteworthy/4.1/4.1.html" label="JGit">
+ <topic href="help/JGit/New_and_Noteworthy/4.1/4.1.html#Basic_Support_for_Push_Certificates" label="Basic Support for Push Certificates"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/4.1/4.1.html#Ignore_Handling" label="Ignore Handling"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/4.1/4.1.html#Other_Enhancements" label="Other Enhancements"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/4.1/4.1.html#Performance_Improvements" label="Performance Improvements"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/4.1/4.1.html#Build_and_Release_Engineering" label="Build and Release Engineering"></topic>
</topic>
- <topic href="help/JGit/New_and_Noteworthy/4.0/Bug-Fixes.html" label="Bug Fixes"></topic>
- <topic href="help/JGit/New_and_Noteworthy/4.0/Contributors.html" label="Contributors"></topic>
- <topic href="help/JGit/New_and_Noteworthy/4.0/Updating-This-Document.html" label="Updating This Document"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/4.1/Bug-Fixes.html" label="Bug Fixes"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/4.1/Contributors.html" label="Contributors"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/4.1/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>
@@ -499,7 +500,7 @@
<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_1_.28recommended.29:_Use_a_Target_Platform" label="Option 1 (recommended): 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>
@@ -531,7 +532,10 @@
</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#Filing_Bugs" label="Filing Bugs">
+ <topic href="help/EGit/Contributor_Guide/Bugs.html#How_to_file_bugs" label="How to file bugs"></topic>
+ <topic href="help/EGit/Contributor_Guide/Bugs.html#File_a_bug" label="File a bug"></topic>
+ </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>

Back to the top