diff options
| author | Matthias Sohn | 2016-12-23 22:23:08 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2016-12-23 23:15:12 +0000 |
| commit | 2e24f53c6260449db876841a6ffa88104f72278c (patch) | |
| tree | 05ef894bf3f9d31483cf1bf5520e05af0e4b725a | |
| parent | f19f61427fd4e6aad44b8851e7661fc814074c50 (diff) | |
| download | egit-2e24f53c6260449db876841a6ffa88104f72278c.tar.gz egit-2e24f53c6260449db876841a6ffa88104f72278c.tar.xz egit-2e24f53c6260449db876841a6ffa88104f72278c.zip | |
Update documentation for 4.6
Change-Id: Ibbc123eff53f4096c84c1f044e314b18652bf814
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
21 files changed, 321 insertions, 271 deletions
diff --git a/org.eclipse.egit.doc/build-help.xml b/org.eclipse.egit.doc/build-help.xml index 60948e3d7d..8e2b289344 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.5" title="EGit 4.5 New and Noteworthy" /> - <path name="JGit/New_and_Noteworthy/4.5" title="JGit 4.5 New and Noteworthy" /> + <path name="EGit/New_and_Noteworthy/4.6" title="EGit 4.6 New and Noteworthy" /> + <path name="JGit/New_and_Noteworthy/4.6" title="JGit 4.6 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 1e47bdda92..3224d1291e 100644 --- a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Bugs.html +++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Bugs.html @@ -247,6 +247,11 @@ </table> <p> <br/> + </p> + <h2 id="Spam_Bugs">Spam Bugs</h2> + <p>If you come across spam bugs you can request webmaster to delete them by marking them as duplicate of bug 442999.</p> + <p>Also see + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=502814" target="egit_external">bug 502814</a> </p><hr class="navigation-separator"/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <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 300d089f4c..3712a5175c 100644 --- a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html +++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html @@ -36,7 +36,7 @@ <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) + <a href="http://maven.apache.org/download.html" target="egit_external">at least Maven 3.0.0</a> </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 @@ -57,7 +57,7 @@ <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</li> + <li>use Java 8 to run the JGit Maven build</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> @@ -108,13 +108,49 @@ <pre>[~/src/egit] $ 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>[~/src/egit] $ mvn -P platform-juno clean install + <p>If you wan to build EGit for the specific Neon (4.6) platform, consider using the <code>egit-4.6</code> target platform:</p> + <pre>[~/src/egit] $ mvn -Dtarget-platform=egit-4.6 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>For EGit version 4.6, <code>egit-4.5</code> (Mars, Eclipse 4.5), <code>egit-4.6</code> (Neon, Eclipse 4.6), and <code>egit-4.7</code> (Oxygen, Eclipse 4.7) are available. In addition <code>egit-4.7-staging</code> refers to the Oxygen 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>Preferences>Plug-in Development>Target Platform). The default target platform defined in the maven build is currently Eclipse 4.3. + <i>egit/org.eclipse.egit.repository/target/repository</i>. 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 <code>target-platform</code> the target platform for Eclipse 4.6 will be used. </p> + <h2 id="JGit_Buck_Build">JGit Buck Build</h2> + <p>The JGit libraries used by Gerrit Code Review can also be built using + <a href="https://buckbuild.com/" target="egit_external">buck</a>: + </p> + <ul> + <li> + <a href="https://buckbuild.com/setup/getting_started.html" target="egit_external">install buck</a> + </li> + <li>to build all libraries run</li> + </ul> + <pre>[jgit] $ buck build all +</pre> + <ul> + <li>to run the unit tests run</li> + </ul> + <pre>[jgit] $ buck test +</pre> + <h2 id="JGit_Bazel_Build">JGit Bazel Build</h2> + <p>Since Gerrit is migrating its build from buck to + <a href="https://www.bazel.io/" target="egit_external">Bazel</a> a + <a href="https://git.eclipse.org/r/#/c/84527/" target="egit_external">Bazel build for JGit</a> is under construction. + </p> + <p>You can try the Bazel build:</p> + <ul> + <li> + <a href="https://www.bazel.io/versions/master/docs/install.html" target="egit_external">install Bazel</a> + </li> + <li>fetch the change implementing the Bazel build</li> + </ul> + <pre>[jgit] $ git fetch <a href="https://git.eclipse.org/r/a/jgit/jgit" target="egit_external">https://git.eclipse.org/r/a/jgit/jgit</a> refs/changes/27/84527/8 && git checkout FETCH_HEAD +</pre> + <ul> + <li>to build all libraries run</li> + </ul> + <pre>[jgit] $ bazel build :all +</pre> <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> 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 4872b079b3..76259eede3 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> </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 Java 7 and Eclipse 3.8.2. You cannot use API's that are newer.</li> + <li>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.</li> </ul> <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 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 6368eb2090..6e4b20647e 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> <li>Restart</li> </ul> <h3 id="Java_Requirements">Java Requirements</h3> - <p>EGit and JGit have Java 7.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>EGit and JGit have Java 8.0 and + <a href="https://wiki.eclipse.org/EGit/FAQ#What_versions_of_Eclipse_does_EGit_target.3F" target="egit_external">Eclipse Platform 4.4 (Luna)</a> as minimum requirements, so dependencies to newer Java and platform versions must be avoided. </p> <p>We are using <i>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 7. If you followed the instructions in the + <a href="https://git.eclipse.org/r/#/c/4365/" target="egit_external">EGit</a>) to facilitate detecting code which isn't working on Java 8. If you followed the instructions in the <i>Tools</i> section above, the necessary descriptions should already be installed. Otherwise install <i>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>. 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 82ae9adc00..0000000000 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.5/4.5.html +++ /dev/null @@ -1,80 +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.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 4.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 class="navigation-separator"/> - <h1 id="EGit">EGit</h1> - <h2 id="Features">Features</h2> - <ul> - <li>Staging view: Fix expansion problems and provide auto selection support.</li> - <li>Check for running launches before modifying the workspace before checkout, pull, rebase, interactive rebase, merge, reset --hard, replace with, cherry-pick</li> - <li>GitHistoryPage: move the search widget into the toolbar</li> - <li>Auto-stage selected files on "Commit..." when staging view is used</li> - <li>Added context menu support for nested repositories.</li> - <li>Immediate user feedback on failed push background jobs</li> - <li>Push to Gerrit in a background job</li> - <li>Allow to cancel the deletion of branches operation</li> - <li>Avoid opening dialogs from push/fetch background jobs</li> - <li>Recompute index diff (git status) on project deletions</li> - <li>Polish the UI of the rebase interactive view</li> - <li>Open the smart import wizard if available (Eclipse 4.6 or higher).</li> - <li>Keyboard shortcuts for the rebase interactive view</li> - <li>Do not show "Rebase was aborted" dialog if the user pressed abort</li> - <li>[blame] Don’t open the History view automatically when showing annotations</li> - <li>Suppress bare repositories in RepositorySearchDialog</li> - <li>Make columns in Gitflow feature checkout dialog sortable</li> - </ul> - <h2 id="Performance">Performance</h2> - <ul> - <li>Speed up the IgnoreOperation</li> - <li>Speed up context menu in staging view</li> - <li>More efficient label provider for the staging view</li> - <li>Improve performance of StagingView a little</li> - </ul> - <h2 id="Releng">Releng</h2> - <ul> - <li>Update and improve Oomph setup for setting up Eclipse for JGit/EGit contributors.</li> - <li> - <a href="https://wiki.eclipse.org/EGit/Contributor_Guide#Automated_Developer_Setup" target="egit_external">Documented automated developer setup</a> for JGit/EGit contributors - </li> - </ul><hr class="navigation-separator"/> - <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.6/4.6.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.6/4.6.html new file mode 100644 index 0000000000..45c95436a4 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.6/4.6.html @@ -0,0 +1,93 @@ +<?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.6 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.6 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 class="navigation-separator"/> + <h1 id="EGit">EGit</h1> + <h2 id="Features">Features</h2> + <ul> + <li>Add hyperlinks to unified Diff Viewer to enable opening</li> + <li>Open the previous version in an editor</li> + <li>Open the workspace version (if it exists) in an editor</li> + <li>Open "this" version (i.e., the “current” one of the diff) in an editor</li> + <li>Open a two-way diff between the previous and this version in a compare editor</li> + <li>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".</li> + <li>Add an outline view for the diff tab of the Commit Viewer and enable text editor toolbar items</li> + <li>Handle rebase modes 'preserve' and 'interactive' in EGit</li> + <li>Introduce GitSynchronizer for logical model support</li> + <li>Make auto-staging of files being moved configurable</li> + <li>Make auto-staging of files being deleted configurable</li> + <li>Compare/ReplaceWithPrevious support for multiple resources (in mappings)</li> + </ul> + <h2 id="Usability_Improvements">Usability Improvements</h2> + <ul> + <li>Show accurate progress reports for pull</li> + <li>Use "Revision Information" label in preferences and update job</li> + <li>Hide warning when reconfiguring upstream from local to remote branch</li> + <li>Suppress the "Interactive rebase has been prepared" dialog</li> + <li>Give focus to commit message when auto-staging is enabled</li> + <li>More configurable date formatting</li> + <li>Improve listing in "Report Bug or Enhancement" dialog</li> + <li>Use "Show Revision Information" instead of "Show Annotations"</li> + <li>Save and restore previously selected reset type</li> + <li>Show Git Staging view in Git Repositories view's Show In menu</li> + <li>Improve search implementation in RepositorySearchDialog</li> + </ul> + <h2 id="Performance_Improvements">Performance Improvements</h2> + <ul> + <li>Fix that click on search result caused EGit to stat the repository directory</li> + </ul> + <h2 id="Build_and_Release_Engineering">Build and Release Engineering</h2> + <ul> + <li>Change EGit minimum execution environment to JavaSE-1.8</li> + <li>Change EGit Github Client's minimum execution environment to JavaSE-1.8</li> + <li>Add Oxygen target platform, remove target platforms older than Mars</li> + <li>Automatic Oomph Developer Setup + <ul> + <li>Add branding</li> + <li>Activate Change-Id</li> + <li>Update Oomph egit setup</li> + <li>Enforce UTF8 encoding of workspace</li> + </ul> + </li> + </ul><hr class="navigation-separator"/> + <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.5/Bug-Fixes.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.6/Bug-Fixes.html index 259466ab4a..80ffb91092 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 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit 4.5 New and Noteworthy - Bug Fixes</title> + <title>EGit 4.6 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.5.html" title="EGit 4.5 New and Noteworthy"> + <a href="4.6.html" title="EGit 4.6 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.5 New and Noteworthy</td> + <td style="width: 20%" align="left" valign="top">EGit 4.6 New and Noteworthy</td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top">Contributors</td> </tr> </table><hr class="navigation-separator"/> <h1 id="Bug_Fixes">Bug Fixes</h1> <p> - <a href="https://bugs.eclipse.org/bugs/buglist.cgi?resolution=FIXED&resolution=DUPLICATE&classification=Technology&list_id=10006180&order=Importance&product=EGit&query_format=advanced&target_milestone=4.5" target="egit_external"> 32 Bugs and 5 enhancement requests</a> were closed + <a href="https://bugs.eclipse.org/bugs/buglist.cgi?resolution=FIXED&resolution=DUPLICATE&classification=Technology&list_id=10006180&order=Importance&product=EGit&query_format=advanced&target_milestone=4.6" target="egit_external"> 32 Bugs and 5 enhancement requests</a> were closed </p><hr class="navigation-separator"/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"> - <a href="4.5.html" title="EGit 4.5 New and Noteworthy"> + <a href="4.6.html" title="EGit 4.6 New and Noteworthy"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> <td style="width: 60%" align="center"> - <a href="4.5.html" title="EGit 4.5 New and Noteworthy"> - <img alt="EGit 4.5 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="4.6.html" title="EGit 4.6 New and Noteworthy"> + <img alt="EGit 4.6 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.5 New and Noteworthy</td> + <td style="width: 20%" align="left" valign="top">EGit 4.6 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.5/Contributors.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.6/Contributors.html index eb3abf0cff..fd7832abc3 100644 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.5/Contributors.html +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.6/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.5 New and Noteworthy - Contributors</title> + <title>EGit 4.6 New and Noteworthy - Contributors</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> @@ -30,23 +30,20 @@ </tr> </table><hr class="navigation-separator"/> <h1 id="Contributors">Contributors</h1> - <p>The following 16 developers worked on this release:</p> - <p>Andre Bossert, - Andrey Loskutov, - Brandon Dong, - Christian Halstrick, - David Pursehouse, - Ed Merks, + <p>The following 13 developers worked on this release:</p> + <p>Andrey Loskutov, + Andrey Rodionov, + Dani Megert, + Gunnar Wagenknecht, Lars Vogel, Laurent Delaigue, Marc-Andre Laperle, Matthias Sohn, Max Hohenegger, Michael Keppler, - Stephen Elsemore, + Stefan Dirix, Thomas Wolf, - Tobias Baumann, - Tobias Hein</p><hr class="navigation-separator"/> + Tomasz Zarna</p><hr class="navigation-separator"/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"> @@ -55,8 +52,8 @@ </a> </td> <td style="width: 60%" align="center"> - <a href="4.5.html" title="EGit 4.5 New and Noteworthy"> - <img alt="EGit 4.5 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="4.6.html" title="EGit 4.6 New and Noteworthy"> + <img alt="EGit 4.6 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.5/Updating-This-Document.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.6/Updating-This-Document.html index 57618e0a1b..7947b5c792 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 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit 4.5 New and Noteworthy - Updating This Document</title> + <title>EGit 4.6 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.5" target="egit_external">http://wiki.eclipse.org/EGit/New_and_Noteworthy/4.5</a> + <a href="http://wiki.eclipse.org/EGit/New_and_Noteworthy/4.6" target="egit_external">http://wiki.eclipse.org/EGit/New_and_Noteworthy/4.6</a> </p><hr class="navigation-separator"/> <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.5.html" title="EGit 4.5 New and Noteworthy"> - <img alt="EGit 4.5 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="4.6.html" title="EGit 4.6 New and Noteworthy"> + <img alt="EGit 4.6 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/Reference.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Reference.html index 62cf437620..0ff68deb08 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Reference.html +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/Reference.html @@ -869,7 +869,9 @@ </p> <p>Each line in <code>.gitignore</code> files defines a pattern. Git checks ignore patterns following the hierarchy of the working tree from highest to lowest. Patterns defined in higher level <code>.gitignore</code> 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.</p> - <p>Pattern format definition:</p> + <p> + <a href="https://git-scm.com/docs/gitignore#_pattern_format" target="egit_external">Pattern format</a> definition: + </p> <ul> <li>blank lines are ignored</li> <li>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 acd495e481..c17106072c 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 @@ <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="Pushing_as_Draft">Pushing as Draft</h4> + <p>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 + <a href="https://gerrit-review.googlesource.com/Documentation/intro-user.html#drafts" target="egit_external">push a draft change to Gerrit</a>. + </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> @@ -2493,24 +2497,27 @@ Sein oder nicht sein </li> </ul> <p> - <img border="0" src="images/Commit-editor-commit-page.png"/> + <img border="0" src="images/Commit-editor-commit-page-egit-4.6.png"/> </p> <ul> <li>Diff tab <ul> - <li>Text viewer with the output of the file differences</li> - <li>The colors used in the viewer can be configured from the + <li>Read-only text editor with the output of the file differences, with a content outline linked to the editor.</li> + <li>The colors used in the viewer for highlighting lines can be configured from the <b>Preferences</b> > <b>General</b> > <b>Appearance</b> > <b>Colors and Fonts</b> > - <i>Git</i> folder + <i>Git</i> folder. </li> + <li>The overview ruler right of the editor's text viewer shows colored annotations for all added or removed lines.</li> + <li>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-.").</li> + <li>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.</li> </ul> </li> </ul> <p> - <img border="0" src="images/Commit-editor-diff-page.png"/> + <img border="0" src="images/Commit-editor-diff-page-egit-4.6.png"/> </p> <ul> <li>Notes tab @@ -2520,7 +2527,7 @@ Sein oder nicht sein </li> </ul> <p> - <img border="0" src="images/Commit-editor-notes-page.png"/> + <img border="0" src="images/Commit-editor-notes-page-egit-4.6.png"/> </p> <h3 id="Tagging_a_commit">Tagging a commit</h3> <ul> diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Commit-editor-commit-page-egit-4.6.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Commit-editor-commit-page-egit-4.6.png Binary files differnew file mode 100644 index 0000000000..a0bb7b2b84 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Commit-editor-commit-page-egit-4.6.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Commit-editor-diff-page-egit-4.6.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Commit-editor-diff-page-egit-4.6.png Binary files differnew file mode 100644 index 0000000000..c8f35ae945 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Commit-editor-diff-page-egit-4.6.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Commit-editor-notes-page-egit-4.6.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Commit-editor-notes-page-egit-4.6.png Binary files differnew file mode 100644 index 0000000000..3e24273363 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Commit-editor-notes-page-egit-4.6.png diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.5/4.5.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.5/4.5.html deleted file mode 100644 index 632a09a8d5..0000000000 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.5/4.5.html +++ /dev/null @@ -1,92 +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.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 4.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 class="navigation-separator"/> - <h1 id="JGit">JGit</h1> - <h2 id="Features">Features</h2> - <ul> - <li>Push implementation of option strings.</li> - </ul> - <p>Example usage:</p> - <pre> $ ./jgit push \ - --push-option "Reviewer=j.doe@example.org" \ - --push-option "<arbitrary string>" \ - origin HEAD:refs/for/master -</pre> - <p>Push options were also added to cgit</p> - <ul> - <li>Packet logging for JGit</li> - </ul> - <p>Imitate the packet tracing feature from C Git. Unlike C Git, use the log4j - log level setting instead of the GIT_TRACE_PACKET environment variable - to enable tracing. Use as follows: - 1. Enable tracing by adding the lines</p> - <pre> log4j.logger.org.eclipse.jgit.transport=DEBUG, stderr - log4j.additivity.org.eclipse.jgit.transport=false - to org.eclipse.jgit.pgm/resources/log4j.properties. -</pre> - <p>2. mvn package - 3. org.eclipse.jgit.pgm/target/jgit \</p> - <pre> ls-remote git://git.kernel.org/pub/scm/git/git 2>&1 | less -</pre> - <p>Then the output provides a trace of packets sent and received over the wire</p> - <ul> - <li>Shallow fetch/clone: Make --depth mean the total history depth</li> - <li>cgit changed the --depth parameter to mean the total depth of history rather than the depth of ancestors to be returned. JGit still uses the latter meaning, so update it to match cgit.</li> - <li>Shallow fetch: Respect "shallow" lines</li> - <li>ReceivePack: report protocol parsing failures on channel 3</li> - <li>Push: Report fatal server errors during pack writing</li> - <li>Add configureJSch() method to allow configuration of JSch objects</li> - <li>Add support for post-commit hooks</li> - <li>Enhance ResetCommand to allow disabling reflog update</li> - </ul> - <h2 id="JGit_Command_Line">JGit Command Line</h2> - <ul> - <li>Added a clean command.</li> - <li>Tag command: implement option -d for deleting tags</li> - </ul> - <h2 id="LFS">LFS</h2> - <ul> - <li>improve exception handling in LfsProtocolServlet</li> - </ul><hr class="navigation-separator"/> - <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.6/4.6.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.6/4.6.html new file mode 100644 index 0000000000..886bb9639c --- /dev/null +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.6/4.6.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.6 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.6 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 class="navigation-separator"/> + <h1 id="JGit">JGit</h1> + <h2 id="Features">Features</h2> + <ul> + <li>Implement auto gc</li> + <li>CheckoutCommand: Add method to add multiple paths</li> + <li>Add "concurrencyLevel" option to DfsBlockCache</li> + <li>Add ReceivedPackStatistics for PackParser</li> + </ul> + <h2 id="JGit_Command_Line">JGit Command Line</h2> + <ul> + <li>Checkout: Add the ability to checkout all paths.</li> + </ul> + <h2 id="LFS_Support">LFS Support</h2> + <ul> + <li>Add built-in LFS smudge filter for local case</li> + <li>Add built-in LFS clean filter</li> + <li>Add configuration parameter to enable built-in hooks/filters</li> + <li>Add support for built-in smudge filters</li> + <li>Add support for built-in clean filters</li> + </ul> + <h2 id="JGit_Ketch">JGit Ketch</h2> + <ul> + <li>Define MonotonicClock interface for advanced timestamps</li> + </ul> + <h2 id="Build_and_Release_Engineering">Build and Release Engineering</h2> + <ul> + <li>Update JGit minimum execution environment to JavaSE-1.8</li> + <li>Update JavaEWAH to 1.1.6</li> + <li>Add Oxygen target platform and remove target platforms older than Mars</li> + <li>Buck build: upgrade buck to latest version</li> + <li>Configure Maven to run tests concurrently by default</li> + <li>Enable error-prone for the Maven build</li> + <li>Use consistent feature and category names</li> + </ul><hr class="navigation-separator"/> + <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.5/Bug-Fixes.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.6/Bug-Fixes.html index 9c61f8325f..2d0e355314 100644 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.5/Bug-Fixes.html +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.6/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.5 New and Noteworthy - Bug Fixes</title> + <title>JGit 4.6 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.5.html" title="JGit 4.5 New and Noteworthy"> + <a href="4.6.html" title="JGit 4.6 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.5 New and Noteworthy</td> + <td style="width: 20%" align="left" valign="top">JGit 4.6 New and Noteworthy</td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top">Contributors</td> </tr> </table><hr class="navigation-separator"/> <h1 id="Bug_Fixes">Bug Fixes</h1> <p> - <a href="https://bugs.eclipse.org/bugs/buglist.cgi?classification=Technology&list_id=10006180&order=Importance&product=JGit&query_format=advanced&resolution=FIXED&resolution=DUPLICATE&target_milestone=4.5" target="egit_external"> 9 Bugs</a> were closed + <a href="https://bugs.eclipse.org/bugs/buglist.cgi?classification=Technology&list_id=10006180&order=Importance&product=JGit&query_format=advanced&resolution=FIXED&resolution=DUPLICATE&target_milestone=4.6" target="egit_external"> 2 enhancement requests and 3 bugs</a> were closed </p><hr class="navigation-separator"/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"> - <a href="4.5.html" title="JGit 4.5 New and Noteworthy"> + <a href="4.6.html" title="JGit 4.6 New and Noteworthy"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> <td style="width: 60%" align="center"> - <a href="4.5.html" title="JGit 4.5 New and Noteworthy"> - <img alt="JGit 4.5 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="4.6.html" title="JGit 4.6 New and Noteworthy"> + <img alt="JGit 4.6 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.5 New and Noteworthy</td> + <td style="width: 20%" align="left" valign="top">JGit 4.6 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.5/Contributors.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.6/Contributors.html index 6174494f3b..2381ec370d 100644 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.5/Contributors.html +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.6/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.5 New and Noteworthy - Contributors</title> + <title>JGit 4.6 New and Noteworthy - Contributors</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> @@ -30,30 +30,26 @@ </tr> </table><hr class="navigation-separator"/> <h1 id="Contributors">Contributors</h1> - <p>The following 23 developers worked on this release of JGit :</p> - <p>Andrey Loskutov, - Christian Halstrick, - Christian Pontesegger, - Dave Borowitz, - Dan Wang, - David Pursehouse, - Hugo Arès, - Jens Offenbach, - Jonathan Nieder, - Marco Miller, - Mark Ingram, - Markus Keller, - Martin Goellnitz, - Masaya Suzuki, - Matthaus Owens, - Matthias Sohn, - Michael Keppler, - Mike Williams, - Ned Twigg, - Shawn Pearce, - Stefan Beller, - Terry Parker, - Thomas Wolf</p><hr class="navigation-separator"/> + <p>The following 19 developers worked on this release of JGit :</p> + <p>Christian Halstrick + Dave Borowitz + David Pursehouse + David Turner + Grace Wang + Hugo Arès + Jacek Centkowski + Jonathan Nieder + Kevin Corcoran + Marc Strapetz + Masaya Suzuki + Matthias Sohn + Ned Twigg + Philipp Marx + Rüdiger Herrmann + Shawn Pearce + Thomas Meyer + Thomas Wolf + Zhen Chen</p><hr class="navigation-separator"/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"> @@ -62,8 +58,8 @@ </a> </td> <td style="width: 60%" align="center"> - <a href="4.5.html" title="JGit 4.5 New and Noteworthy"> - <img alt="JGit 4.5 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="4.6.html" title="JGit 4.6 New and Noteworthy"> + <img alt="JGit 4.6 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.5/Updating-This-Document.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.6/Updating-This-Document.html index c6988d7069..9475579f8e 100644 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.5/Updating-This-Document.html +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.6/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.5 New and Noteworthy - Updating This Document</title> + <title>JGit 4.6 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.5" target="egit_external">http://wiki.eclipse.org/JGit/New_and_Noteworthy/4.5</a> + <a href="http://wiki.eclipse.org/JGit/New_and_Noteworthy/4.6" target="egit_external">http://wiki.eclipse.org/JGit/New_and_Noteworthy/4.6</a> </p><hr class="navigation-separator"/> <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.5.html" title="JGit 4.5 New and Noteworthy"> - <img alt="JGit 4.5 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="4.6.html" title="JGit 4.6 New and Noteworthy"> + <img alt="JGit 4.6 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 e6ebe53fde..735d050b04 100644 --- a/org.eclipse.egit.doc/help/toc.xml +++ b/org.eclipse.egit.doc/help/toc.xml @@ -95,6 +95,7 @@ <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 href="help/EGit/User_Guide/Tasks.html#Pushing_as_Draft" label="Pushing as Draft"></topic> <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> @@ -442,25 +443,28 @@ </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.5/4.5.html" label="EGit 4.5 New and Noteworthy"> - <topic href="help/EGit/New_and_Noteworthy/4.5/4.5.html" label="EGit"> - <topic href="help/EGit/New_and_Noteworthy/4.5/4.5.html#Features" label="Features"></topic> - <topic href="help/EGit/New_and_Noteworthy/4.5/4.5.html#Performance" label="Performance"></topic> - <topic href="help/EGit/New_and_Noteworthy/4.5/4.5.html#Releng" label="Releng"></topic> + <topic href="help/EGit/New_and_Noteworthy/4.6/4.6.html" label="EGit 4.6 New and Noteworthy"> + <topic href="help/EGit/New_and_Noteworthy/4.6/4.6.html" label="EGit"> + <topic href="help/EGit/New_and_Noteworthy/4.6/4.6.html#Features" label="Features"></topic> + <topic href="help/EGit/New_and_Noteworthy/4.6/4.6.html#Usability_Improvements" label="Usability Improvements"></topic> + <topic href="help/EGit/New_and_Noteworthy/4.6/4.6.html#Performance_Improvements" label="Performance Improvements"></topic> + <topic href="help/EGit/New_and_Noteworthy/4.6/4.6.html#Build_and_Release_Engineering" label="Build and Release Engineering"></topic> </topic> - <topic href="help/EGit/New_and_Noteworthy/4.5/Bug-Fixes.html" label="Bug Fixes"></topic> - <topic href="help/EGit/New_and_Noteworthy/4.5/Contributors.html" label="Contributors"></topic> - <topic href="help/EGit/New_and_Noteworthy/4.5/Updating-This-Document.html" label="Updating This Document"></topic> + <topic href="help/EGit/New_and_Noteworthy/4.6/Bug-Fixes.html" label="Bug Fixes"></topic> + <topic href="help/EGit/New_and_Noteworthy/4.6/Contributors.html" label="Contributors"></topic> + <topic href="help/EGit/New_and_Noteworthy/4.6/Updating-This-Document.html" label="Updating This Document"></topic> </topic> - <topic href="help/JGit/New_and_Noteworthy/4.5/4.5.html" label="JGit 4.5 New and Noteworthy"> - <topic href="help/JGit/New_and_Noteworthy/4.5/4.5.html" label="JGit"> - <topic href="help/JGit/New_and_Noteworthy/4.5/4.5.html#Features" label="Features"></topic> - <topic href="help/JGit/New_and_Noteworthy/4.5/4.5.html#JGit_Command_Line" label="JGit Command Line"></topic> - <topic href="help/JGit/New_and_Noteworthy/4.5/4.5.html#LFS" label="LFS"></topic> + <topic href="help/JGit/New_and_Noteworthy/4.6/4.6.html" label="JGit 4.6 New and Noteworthy"> + <topic href="help/JGit/New_and_Noteworthy/4.6/4.6.html" label="JGit"> + <topic href="help/JGit/New_and_Noteworthy/4.6/4.6.html#Features" label="Features"></topic> + <topic href="help/JGit/New_and_Noteworthy/4.6/4.6.html#JGit_Command_Line" label="JGit Command Line"></topic> + <topic href="help/JGit/New_and_Noteworthy/4.6/4.6.html#LFS_Support" label="LFS Support"></topic> + <topic href="help/JGit/New_and_Noteworthy/4.6/4.6.html#JGit_Ketch" label="JGit Ketch"></topic> + <topic href="help/JGit/New_and_Noteworthy/4.6/4.6.html#Build_and_Release_Engineering" label="Build and Release Engineering"></topic> </topic> - <topic href="help/JGit/New_and_Noteworthy/4.5/Bug-Fixes.html" label="Bug Fixes"></topic> - <topic href="help/JGit/New_and_Noteworthy/4.5/Contributors.html" label="Contributors"></topic> - <topic href="help/JGit/New_and_Noteworthy/4.5/Updating-This-Document.html" label="Updating This Document"></topic> + <topic href="help/JGit/New_and_Noteworthy/4.6/Bug-Fixes.html" label="Bug Fixes"></topic> + <topic href="help/JGit/New_and_Noteworthy/4.6/Contributors.html" label="Contributors"></topic> + <topic href="help/JGit/New_and_Noteworthy/4.6/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> @@ -503,6 +507,8 @@ <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#JGit_Buck_Build" label="JGit Buck Build"></topic> + <topic href="help/EGit/Contributor_Guide/Builds.html#JGit_Bazel_Build" label="JGit Bazel Build"></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"> @@ -532,6 +538,7 @@ <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 href="help/EGit/Contributor_Guide/Bugs.html#Spam_Bugs" label="Spam Bugs"></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"> |
