diff options
| author | Matthias Sohn | 2013-06-10 20:48:40 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2013-06-10 20:52:41 +0000 |
| commit | b8d476648ed41f7c47edc2dc323c4e124f62737a (patch) | |
| tree | 6ec4c5aeca3ac375d20732d256b4dc187a55c3f4 | |
| parent | 64e95608a6c83016e013884ab6cbcce6af78ecb3 (diff) | |
| download | egit-b8d476648ed41f7c47edc2dc323c4e124f62737a.tar.gz egit-b8d476648ed41f7c47edc2dc323c4e124f62737a.tar.xz egit-b8d476648ed41f7c47edc2dc323c4e124f62737a.zip | |
Update documentation for 3.0
Change-Id: I1976d5785ab5e2c8eb4ca64a3069065b30c81a57
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
25 files changed, 794 insertions, 271 deletions
diff --git a/org.eclipse.egit.doc/build-help.xml b/org.eclipse.egit.doc/build-help.xml index 7de1ced3cb..873179d261 100644 --- a/org.eclipse.egit.doc/build-help.xml +++ b/org.eclipse.egit.doc/build-help.xml @@ -2,7 +2,7 @@ <project name="org.eclipse.egit.doc" basedir="." default="all"> <!-- Copyright (c) 2010 Chris Aniszczyk and others. - Copyright (c) 2010-2012 Matthias Sohn <matthias.sohn@sap.com> + Copyright (c) 2010,2013 Matthias Sohn <matthias.sohn@sap.com> All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at @@ -38,8 +38,8 @@ generateUnifiedToc="true"> <path name="EGit/User_Guide" title="EGit User Guide" /> <path name="JGit/User_Guide" title="JGit User Guide" /> - <path name="EGit/New_and_Noteworthy/2.3" title="EGit 2.3 New and Noteworthy" /> - <path name="JGit/New_and_Noteworthy/2.3" title="JGit 2.3 New and Noteworthy" /> + <path name="EGit/New_and_Noteworthy/3.0" title="EGit 3.0 New and Noteworthy" /> + <path name="JGit/New_and_Noteworthy/3.0" title="JGit 3.0 New and Noteworthy" /> <path name="EGit/Git_For_Eclipse_Users" title="Git for Eclipse Users" /> <stylesheet url="book.css" /> <pageAppendum> diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/2.3/2.3.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/2.3/2.3.html deleted file mode 100644 index 19ebdd5cb0..0000000000 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/2.3/2.3.html +++ /dev/null @@ -1,66 +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 2.3 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 2.3 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="API-changes.html" title="API changes"> - <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">API changes</td> - </tr> - </table><hr/> - <h1 id="Features">Features</h1> - <ul> - <li>"Fetch from Gerrit..." recognizes Gerrit fetch command copied to clipboard ( - <a href="https://git.eclipse.org/r/#/c/9391" target="egit_external">https://git.eclipse.org/r/#/c/9391</a>) - </li> - <li>Linked resources are now handled correctly ( - <a href="https://git.eclipse.org/r/#/c/3680/" target="egit_external">https://git.eclipse.org/r/#/c/3680/</a>). They are typically ignored unless they point to a resource within the same repository as the containing project. In that case they are decorated according to their git status, and one can operate on them along with regular resources. - </li> - <li>Added git clean action for repositories</li> - <li>Repositories View: added "Show In" support for resources and tags</li> - <li>Repositories View: Add "History" to Show In menu for all perspectives</li> - <li>History View: filtered files are now highlighted in file diff viewer</li> - <li>Commit Dialog: Changed table to filtered tree in order to enable quick filtering of file list</li> - <li>New preference (on by default): Automatically ignore derived resources by adding them to .gitignore</li> - <li>Improved support for logical models in "Compare With" operation</li> - <li>Perform synchronization for logical models in Commit and History View</li> - <li>Support git merge --no-ff as an EGit preference</li> - <li>Merge Tool can now also be used for conflicts of applying stashed changes</li> - <li>Font and colors of headlines in diff tab of commit viewer can now be customized via preferences</li> - <li>Added checkbox for nested project search to "Import Projects" page</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="API-changes.html" title="API changes"> - <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">API changes</td> - </tr> - </table> - </body> -</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.0/3.0.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.0/3.0.html new file mode 100644 index 0000000000..0ce3c8ebdc --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.0/3.0.html @@ -0,0 +1,89 @@ +<?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 3.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 3.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="GitHub-Connector-Features.html" title="GitHub Connector Features"> + <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">GitHub Connector Features</td> + </tr> + </table><hr/> + <h1 id="EGit_Features">EGit Features</h1> + <h2 id="Rename_Detection">Rename Detection</h2> + <p>Rename detection was added to the file diff viewer in the History view and Commit editor ( + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=335082" target="egit_external">bug 335082</a>): + </p> + <p> + <img border="0" src="images/EGit-3.0-file-diff-rename.png"/> + </p> + <p>The Git Quick Diff provider also detects renames now ( + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=335081" target="egit_external">bug 335081</a>). + </p> + <h2 id="Reset_to_Expression">Reset to Expression</h2> + <p>Allow reset to user-entered commit expression in reset dialog ( + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=352142" target="egit_external">bug 352142</a>): + </p> + <p> + <img border="0" src="images/EGit-3.0-reset-to-expression.png"/> + </p> + <h2 id="Other">Other</h2> + <ul> + <li>Show fast forward modes in merge dialog ( + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=397835" target="egit_external">bug 397835</a>). + </li> + <li>Consider the ancestor when comparing with remote revisions ( + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=400943" target="egit_external">bug 400943</a>). + </li> + <li>Allow users to show server messages while pushing ( + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=398387" target="egit_external">bug 398387</a>). + </li> + <li>Share project: Allow "Create Repository" even when a parent directory already contains a repository ( + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=407190" target="egit_external">bug 407190</a>). + </li> + <li>Commit dialog: the file section can now be resized by hovering the mouse just above the file section title and dragging the sash up or down, making the message section increase/decrease accordingly ( + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=343712" target="egit_external">bug 343712</a>). + </li> + <li>Also show committer if different from author in result dialogs of fetch, pull and push ( + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=363023" target="egit_external">bug 363023</a>). + </li> + <li>History view: Adjust column widths and don't show e-mail addresses by default to improve space use</li> + <li>Improve error reporting for pull failures due to conflicts</li> + <li>When opening a resource which exists in more than one project (due to nested projects), open it in the most specific project ( + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=404629" target="egit_external">bug 404629</a>). + </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="GitHub-Connector-Features.html" title="GitHub Connector Features"> + <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">GitHub Connector Features</td> + </tr> + </table> + </body> +</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/2.3/Bug-Fixes.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.0/API-changes.html index 72ab7ac7be..0a2059ad0b 100644 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/2.3/Bug-Fixes.html +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.0/API-changes.html @@ -2,17 +2,17 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>JGit 2.3 New and Noteworthy - Bug Fixes</title> + <title>EGit 3.0 New and Noteworthy - API changes</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">Bug Fixes</th> + <th style="width: 100%" align="center" colspan="3">API changes</th> </tr> <tr> <td style="width: 20%" align="left"> - <a href="Performance-Improvements.html" title="Performance Improvements"> + <a href="Bug-Fixes.html" title="Bug Fixes"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> @@ -24,25 +24,29 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">Performance Improvements</td> + <td style="width: 20%" align="left" valign="top">Bug Fixes</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?list_id=1764539;resolution=FIXED;resolution=DUPLICATE;classification=Technology;chfieldto=2013-02-20;query_format=advanced;chfield=bug_status;chfieldfrom=2012-12-20;bug_status=RESOLVED;bug_status=VERIFIED;bug_status=CLOSED;component=JGit;product=JGit" target="egit_external">14 Bugs and 0 enhancement requests</a> were closed - </p><hr/> + <h1 id="API_changes">API changes</h1> + <ul> + <li>All former public packages have been marked internal since they were never intended to be API</li> + <li>File enhancement bugs on + <a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=EGit&component=Core" target="egit_external">EGit Core</a> to specify EGit APIs you need. Prepend + <a href="API">API</a> to the bug title to mark it as API relevant. + </li> + </ul><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"> - <a href="Performance-Improvements.html" title="Performance Improvements"> + <a href="Bug-Fixes.html" title="Bug Fixes"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> <td style="width: 60%" align="center"> - <a href="2.3.html" title="JGit 2.3 New and Noteworthy"> - <img alt="JGit 2.3 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="3.0.html" title="EGit 3.0 New and Noteworthy"> + <img alt="EGit 3.0 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"> @@ -52,7 +56,7 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">Performance Improvements</td> + <td style="width: 20%" align="left" valign="top">Bug Fixes</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/3.0/Bug-Fixes.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.0/Bug-Fixes.html new file mode 100644 index 0000000000..b71a908fcb --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.0/Bug-Fixes.html @@ -0,0 +1,75 @@ +<?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 3.0 New and Noteworthy - Bug Fixes</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">Bug Fixes</th> + </tr> + <tr> + <td style="width: 20%" align="left"> + <a href="Performance-Improvements.html" title="Performance Improvements"> + <img alt="Previous" border="0" src="../../../images/prev.gif"/> + </a> + </td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right"> + <a href="API-changes.html" title="API changes"> + <img alt="Next" border="0" src="../../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top">Performance Improvements</td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">API changes</td> + </tr> + </table><hr/> + <h1 id="Bug_Fixes">Bug Fixes</h1> + <ul> + <li>Fix commit keyboard shortcut Ctrl+# ( + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=363648" target="egit_external">bug 363648</a>). + </li> + <li>Fix rebase pulldown in toolbar not being accessible during rebase ( + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=387184" target="egit_external">bug 387184</a>). + </li> + <li>Fix NPE when operating on a selection containing a linked resource pointing to a file or directory outside of a workspace project git repository ( + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=406922" target="egit_external">bug 406922</a>). + </li> + <li>Fix branch names shown in Configure Branch dialog ( + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=407465" target="egit_external">bug 407465</a>). + </li> + </ul> + <p> + <a href="https://bugs.eclipse.org/bugs/buglist.cgi?list_id=3805932&resolution=FIXED&resolution=DUPLICATE&classification=Technology&chfieldto=2013-06-26&chfield=resolution&query_format=advanced&chfieldfrom=2013-2-20&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&product=EGit" target="egit_external">116 Bugs and 23 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="Performance-Improvements.html" title="Performance Improvements"> + <img alt="Previous" border="0" src="../../../images/prev.gif"/> + </a> + </td> + <td style="width: 60%" align="center"> + <a href="3.0.html" title="EGit 3.0 New and Noteworthy"> + <img alt="EGit 3.0 New and Noteworthy" border="0" src="../../../images/home.gif"/> + </a> + </td> + <td style="width: 20%" align="right"> + <a href="API-changes.html" title="API changes"> + <img alt="Next" border="0" src="../../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top">Performance Improvements</td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">API changes</td> + </tr> + </table> + </body> +</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/2.3/Contributors.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.0/Contributors.html index d0e83b618a..1ff4d383a6 100644 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/2.3/Contributors.html +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.0/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 2.3 New and Noteworthy - Contributors</title> + <title>EGit 3.0 New and Noteworthy - Contributors</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="Bug-Fixes.html" title="Bug Fixes"> + <a href="API-changes.html" title="API changes"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> @@ -24,24 +24,37 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">Bug Fixes</td> + <td style="width: 20%" align="left" valign="top">API changes</td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top">Updating This Document</td> </tr> </table><hr/> <h1 id="Contributors">Contributors</h1> <p>The following 14 developers worked on this release:</p> - <p>Dani Megert, Dariusz Luksza, Francois Rey, Gunnar Wagenknecht, Laurent Goubet, Markus Duft, Markus Keller, Matthias Sohn, Robin Rosenberg, Robin Stocker, Snjezana Peco, Stefan Lay, Tobias Pfeifer, Tomasz Zarna</p><hr/> + <p>André Dietisheim, + Carsten Pfeiffer, + Dani Megert, + François Rey, + Gunnar Wagenknecht, + Jake Wharton, + Kevin Sawicki, + Laurent Goubet, + Markus Keller, + Matthias Sohn, + Robin Rosenberg, + Robin Stocker, + Stephen Elsemore, + Tomasz Zarna</p><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"> - <a href="Bug-Fixes.html" title="Bug Fixes"> + <a href="API-changes.html" title="API changes"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> <td style="width: 60%" align="center"> - <a href="2.3.html" title="EGit 2.3 New and Noteworthy"> - <img alt="EGit 2.3 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="3.0.html" title="EGit 3.0 New and Noteworthy"> + <img alt="EGit 3.0 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"> @@ -51,7 +64,7 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">Bug Fixes</td> + <td style="width: 20%" align="left" valign="top">API changes</td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top">Updating This Document</td> </tr> diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/2.3/API-changes.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.0/GitHub-Connector-Features.html index 2443c1264b..ff494143fc 100644 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/2.3/API-changes.html +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.0/GitHub-Connector-Features.html @@ -2,17 +2,17 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit 2.3 New and Noteworthy - API changes</title> + <title>EGit 3.0 New and Noteworthy - GitHub Connector Features</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">API changes</th> + <th style="width: 100%" align="center" colspan="3">GitHub Connector Features</th> </tr> <tr> <td style="width: 20%" align="left"> - <a href="2.3.html" title="EGit 2.3 New and Noteworthy"> + <a href="3.0.html" title="EGit 3.0 New and Noteworthy"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> @@ -24,28 +24,31 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">EGit 2.3 New and Noteworthy</td> + <td style="width: 20%" align="left" valign="top">EGit 3.0 New and Noteworthy</td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top">Performance Improvements</td> </tr> </table><hr/> - <h1 id="API_changes">API changes</h1> + <h1 id="GitHub_Connector_Features">GitHub Connector Features</h1> <ul> - <li> - <a href="https://git.eclipse.org/r/#/c/3680/25/org.eclipse.egit.core/src/org/eclipse/egit/core/project/RepositoryFinder.java" target="egit_external">RepositoryFinder</a> has now a more concise API for handling linked resources when searching candidate repositories for a project. - <b>The default search behavior has changed: linked resources are now ignored during the search instead of being traversed</b>. Any code that depends on the old default behavior should now use the new find method that also takes a boolean in order to control the traversing of linked resources. + <li>Adapt github connector to use JGit/EGit 3.0</li> + <li>Switch UserPlan fields to long instead of int + <ul> + <li>This expected size can be common for large Enterprise installs.</li> + </ul> </li> + <li>Add service support for contents API</li> </ul><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"> - <a href="2.3.html" title="EGit 2.3 New and Noteworthy"> + <a href="3.0.html" title="EGit 3.0 New and Noteworthy"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> <td style="width: 60%" align="center"> - <a href="2.3.html" title="EGit 2.3 New and Noteworthy"> - <img alt="EGit 2.3 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="3.0.html" title="EGit 3.0 New and Noteworthy"> + <img alt="EGit 3.0 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"> @@ -55,7 +58,7 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">EGit 2.3 New and Noteworthy</td> + <td style="width: 20%" align="left" valign="top">EGit 3.0 New and Noteworthy</td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top">Performance Improvements</td> </tr> diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/2.3/Performance-Improvements.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.0/Performance-Improvements.html index e92c290fa2..7b53ecfe2c 100644 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/2.3/Performance-Improvements.html +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.0/Performance-Improvements.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 2.3 New and Noteworthy - Performance Improvements</title> + <title>EGit 3.0 New and Noteworthy - Performance Improvements</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="API-changes.html" title="API changes"> + <a href="GitHub-Connector-Features.html" title="GitHub Connector Features"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> @@ -24,27 +24,30 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">API changes</td> + <td style="width: 20%" align="left" valign="top">GitHub Connector Features</td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top">Bug Fixes</td> </tr> </table><hr/> <h1 id="Performance_Improvements">Performance Improvements</h1> <ul> - <li>Only refresh projects with changed resources</li> - <li>Synchronize View: Fixed performance problem with GitModelCache#getChildren</li> - <li>Synchronize View: Only refresh on repository change if affected</li> - </ul><hr/> + <li>Lessen the re-indexing work and number of queued jobs ( + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=381856" target="egit_external">bug 381856</a>). + </li> + </ul> + <p>Also see + <a href="http://wiki.eclipse.org/JGit/New_and_Noteworthy/3.0#Performance_Improvements" target="egit_external">JGit 3.0 release notes</a>. + </p><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"> - <a href="API-changes.html" title="API changes"> + <a href="GitHub-Connector-Features.html" title="GitHub Connector Features"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> <td style="width: 60%" align="center"> - <a href="2.3.html" title="EGit 2.3 New and Noteworthy"> - <img alt="EGit 2.3 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="3.0.html" title="EGit 3.0 New and Noteworthy"> + <img alt="EGit 3.0 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"> @@ -54,7 +57,7 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">API changes</td> + <td style="width: 20%" align="left" valign="top">GitHub Connector Features</td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top">Bug Fixes</td> </tr> diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/2.3/Updating-This-Document.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.0/Updating-This-Document.html index 14dd92f702..1741a4a06e 100644 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/2.3/Updating-This-Document.html +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.0/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 2.3 New and Noteworthy - Updating This Document</title> + <title>EGit 3.0 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/2.3" target="egit_external">http://wiki.eclipse.org/EGit/New_and_Noteworthy/2.3</a> + <a href="http://wiki.eclipse.org/EGit/New_and_Noteworthy/3.0" target="egit_external">http://wiki.eclipse.org/EGit/New_and_Noteworthy/3.0</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="2.3.html" title="EGit 2.3 New and Noteworthy"> - <img alt="EGit 2.3 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="3.0.html" title="EGit 3.0 New and Noteworthy"> + <img alt="EGit 3.0 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/New_and_Noteworthy/3.0/images/EGit-3.0-file-diff-rename.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.0/images/EGit-3.0-file-diff-rename.png Binary files differnew file mode 100644 index 0000000000..703eb6dfc3 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.0/images/EGit-3.0-file-diff-rename.png diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.0/images/EGit-3.0-reset-to-expression.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.0/images/EGit-3.0-reset-to-expression.png Binary files differnew file mode 100644 index 0000000000..0cc9e37ef8 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.0/images/EGit-3.0-reset-to-expression.png 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 9fe78b146c..227e605e53 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Reference.html +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/Reference.html @@ -168,7 +168,7 @@ </li> <li> <a href="Tasks.html#Branching">Branch</a>, - <a href="Reference.html#Create_Branch...">Create Branch</a> - Checkout a branch or create a branch. + <a href="#Create_Branch...">Create Branch</a> - Checkout a branch or create a branch. </li> <li> <b>Change Credentials</b> - Change logon credentials of a Fetch or Push Specification, credentials are stored per URL in the Eclipse Secure Store. @@ -176,7 +176,7 @@ <li> <b>Checkout</b> - Checkout a <a href="Tasks.html#Check-out_of_Branches_and_Tags">Branch, Tag</a>, - <a href="Reference.html#Checkout">Commit</a> or Reference. + <a href="#Checkout">Commit</a> or Reference. </li> <li> <a href="Tasks.html#Cherry_Picking">Cherry-pick</a> - Cherry-pick a single commit onto the tip of the currently checked out branch. @@ -209,7 +209,7 @@ <b>Disconnect</b> - Disconnect the attached Git Team Provider from this project. The git repository still exists but is no longer integrated with Eclipse. </li> <li> - <a href="Reference.html#Git_Ignore">Ignore</a> - Add files to .gitignore so that git ignores them. + <a href="#Git_Ignore">Ignore</a> - Add files to .gitignore so that git ignores them. </li> <li> <a href="#Method_for_importing_Projects">Import Projects</a> - Import projects into the Eclipse workbench. @@ -261,7 +261,7 @@ <a href="Tasks.html#Resetting_your_current_HEAD">Reset</a> - Reset the current HEAD, Index or Working Tree. </li> <li> - <a href="Reference.html#History_View">Show in History</a> - Show the selected resource in the History View. + <a href="#History_View">Show in History</a> - Show the selected resource in the History View. </li> <li> <a href="Tasks.html#Managing_Repositories">Show in Repositories View</a> - Show the selected resource in the Repositories View. @@ -381,7 +381,7 @@ <p>It is possible to compare the contents of two commits filtered by the current input by selecting the two commits and right-clicking on <b>Compare with each other</b>. If the current input is not a file, there is an additional menu action <b>Compare with each other in Tree</b>. The first action opens an Eclipse compare editor, the second opens the - <a href="Reference.html#Git_Tree_Compare_View">Git Tree Compare View</a>. + <a href="#Git_Tree_Compare_View">Git Tree Compare View</a>. </p> <p>Furthermore, it is possible to select any number of commits and right-click <b>Open</b> to see all versions of the file corresponding to the selected commits (one editor will be opened per version). @@ -808,8 +808,8 @@ </p> <h2 id="Refspecs">Refspecs</h2> <p>A "refspec" is used by fetch and push operations to describe the mapping between remote - <a href="Reference.html#Git_References">Ref</a> and local - <a href="Reference.html#Git_References">Ref</a>. Semantically they define how local branches or tags are mapped to branches or tags in a remote repository. In native git they are combined with a colon in the format <src>:<dst>, preceded by an optional plus sign, + to denote forced update. In EGit they can be displayed and also edited in tabular form in the + <a href="#Git_References">Ref</a> and local + <a href="#Git_References">Ref</a>. Semantically they define how local branches or tags are mapped to branches or tags in a remote repository. In native git they are combined with a colon in the format <src>:<dst>, preceded by an optional plus sign, + to denote forced update. In EGit they can be displayed and also edited in tabular form in the <a href="Tasks.html#Push_Ref_Specifications">Push Ref Specification</a> and the <a href="Tasks.html#Fetch_Ref_Specifications">Fetch Ref Specification</a> and other dialogs. </p> @@ -819,7 +819,7 @@ <pre>HEAD:refs/heads/master </pre> <p>This means that the currently checked out branch (as signified by the HEAD Reference, see - <a href="Reference.html#Git_References">Git References</a>) will be pushed into the master branch of the remote repository. + <a href="#Git_References">Git References</a>) will be pushed into the master branch of the remote repository. </p> <h3 id="Fetch_Refspecs">Fetch Refspecs</h3> <p>A typical example for a Fetch RefSpec could be</p> @@ -839,13 +839,13 @@ </ul> <p>A Remote first of all defines a <b>name</b> for the repository whose branches you track, this is important since you may want to track branches from different repositories so the name helps to understand what repository a certain operation is dealing with. In addition - <a href="Reference.html#Refspecs">Refspecs</a> specified for a given Remote define a + <a href="#Refspecs">Refspecs</a> specified for a given Remote define a <b>mapping of branches and tags</b> in your local repository to branches and tags in the remote repository. You may want to use different mappings for inbound or outbound transport operations hence there are <a href="Tasks.html#Cloning_Remote_Repositories">editors</a> to define Fetch and Push Configurations available in EGit. </p> <h2 id="Git_Ignore">Git Ignore</h2> <p><code>.gitignore</code> files located in the working tree specify files that intentionally should not be tracked by git. They only concern files that are not yet tracked by git. In order to ignore uncommitted changes in already tracked files refer to the - <a href="Reference.html#Menu_Actions">assume unchanged action</a>. + <a href="#Menu_Actions">assume unchanged action</a>. </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> @@ -869,7 +869,7 @@ </ul> <p>The EGit <b>Ignore</b> - <a href="Reference.html#Menu_Actions">menu action</a> adds the selected resource to the <code>.gitignore</code> file in the resource's parent directory. To enter other ignore patterns use a text editor. + <a href="#Menu_Actions">menu action</a> adds the selected resource to the <code>.gitignore</code> file in the resource's parent directory. To enter other ignore patterns use a text editor. </p> <p> <b>Note:</b> EGit does not yet respect <code>.gitignore</code> files outside Eclipse projects, so if you have a repository containing multiple projects you should add a <code>.gitignore</code> file for each project instead of a single one in the root directory. 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 7f81d27154..c57be64612 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html @@ -297,7 +297,7 @@ </p> <h4 id="Cloning_from_specific_locations">Cloning from specific locations</h4> <p>The Clone wizard of EGit can be extended by other plugins in order to search for repositories on specific backends which host git repositories. Currently such an extension is available for Github and soon will be available for Gerrit. For both you need to install the respective Mylyn connectors. The Gerrit Mylyn connector extension then will also configure the remote repository for the work with Gerrit. This can also be done or changed later from the Git Repositories View, see - <a href="Tasks.html#Gerrit_Configuration">Gerrit Configuration</a>. + <a href="#Gerrit_Configuration">Gerrit Configuration</a>. </p> <p>When you have installed such an extension, the Clone wizard opens with a selection page where you can choose between different sources of the repository to clone:</p> <p> @@ -309,7 +309,7 @@ <a href="#Upstream_Configuration">Upstream Configuration</a>", the most convenient way for pushing relies on this upstream configuration. </p> <p>Typically local branches are created based on a remote tracking branch. Since the remote tracking branch is associated with a remote and the remote contains the information required to access the corresponding remote repository, it is possible to automatically create this upstream configuration while creating the local branch (see - <a href="Tasks.html#Branching">Branching</a> for more information). + <a href="#Branching">Branching</a> for more information). </p> <p>When pushing upstream from the local branch, push requires no further parameters and hence can be performed without showing another dialog based on the stored upstream configuration.</p> <p>In order to push upstream, right-click on a project and select @@ -338,12 +338,12 @@ </p> <p>The "Add" will open a small wizard that helps in the creation of the RefSpecs. You can also paste a RefSpec from the clipboard into the list.</p> <p>Clicking on the "Advanced" control will show/hide an "Edit (Advanced...)" button that allows for more complex RefSpec editing similar to the - <a href="Tasks.html#Push_Wizard">Push Wizard</a> below. + <a href="#Push_Wizard">Push Wizard</a> below. </p> <p>The buttons in the lower button bar allow you to save your changes and do the push immediately, save the changes without fetching, dry-run (push without saving the configuration), revert your changes, and Cancel.</p> <h4 id="Direct_Push">Direct Push</h4> <p>Alternatively, you can use - <a href="Tasks.html#Direct_Fetch_and_Push_Support">Direct Push Support</a> on a Push Specification of a Remote. + <a href="#Direct_Fetch_and_Push_Support">Direct Push Support</a> on a Push Specification of a Remote. </p> <h4 id="Push_Wizard">Push Wizard</h4> <p>The most powerful (but also most complex) way is using the Push Wizard @@ -482,7 +482,7 @@ <a href="#Upstream_Configuration">Upstream Configuration</a>", the most convenient way for fetching relies on this upstream configuration. </p> <p>A local branch is typically created based on a remote tracking branch. Since the remote tracking branch is associated with a remote and this remote contains the information required to access the remote repository, it is possible to automatically create this upstream configuration while creating the local branch (see - <a href="Tasks.html#Branching">Branching</a> for more information). + <a href="#Branching">Branching</a> for more information). </p> <p>When fetching from upstream, this persisted configuration can be used to fetch automatically without the need to provide further parameters in a dialog.</p> <p>In order to fetch from upstream, click @@ -509,12 +509,12 @@ </p> <p>The "Add" button will open a small wizard that helps in the creation of the RefSpecs. You can also paste a RefSpec from the clipboard into the list.</p> <p>Clicking on the "Advanced" control will show/hide an "Edit (Advanced...)" button that allows for more complex RefSpec editing similar to the - <a href="Tasks.html#Fetch_Wizard">Fetch Wizard</a>. + <a href="#Fetch_Wizard">Fetch Wizard</a>. </p> <p>The buttons in the lower button bar allow you to save your changes and do the fetch immediately, save the changes without fetching, dry-run (fetch without saving the configuration), revert your changes, and Cancel.</p> <h4 id="Direct_Fetch">Direct Fetch</h4> <p>Another way for fetching is to use - <a href="Tasks.html#Direct_Fetch_and_Push_Support">Direct Fetch Support</a> on a Fetch Specification of a Remote. + <a href="#Direct_Fetch_and_Push_Support">Direct Fetch Support</a> on a Fetch Specification of a Remote. </p> <h4 id="Fetch_Wizard">Fetch Wizard</h4> <p>The most powerful (but also most complex) way is using the Fetch Wizard @@ -632,7 +632,7 @@ <b>Pull</b> to pull new changes from the upstream branch your local branch is tracking. This also works if resources are selected from more than one repository. </li> <li>Whenever you create a local branch based on a remote tracking branch EGit can configure a tracking relationship so that subsequent pulls will fetch and then merge or rebase (depending on the configuration of this tracking relationship) the changes from the tracked upstream branch; see - <a href="Tasks.html#Branching">Branching</a> for details. + <a href="#Branching">Branching</a> for details. </li> </ul> <p>Ad-hoc selection of the upstream branch to pull from is not yet supported by EGit.</p> @@ -687,7 +687,7 @@ <br/>"refs/changes/" + (last two digits from change number) + / + (change number) + / + (revision number) </li> <li>In the "Actions to perform after fetch" you can decide what to do after the change has been fetched; you can either create and checkout a branch pointing to the change, create and checkout a tag pointing to the change, or simply checkout the change (thus making HEAD detached); the last option does nothing after fetch, but you will be able to find the commit pertaining to the change at FETCH_HEAD (go to the Repositories View and find FETCH_HEAD under the References node of your Repository, see - <a href="Tasks.html#Inspecting_References">Inspecting References </a>). + <a href="#Inspecting_References">Inspecting References </a>). <br/>The name for the branch or tag is suggested by the dialog but can be overwritten as needed. <br/>Since deletion of tags is currently not supported in EGit, we suggest to use local branches rather than tags for the time being. Since the Repositories view allows to group branches hierarchically using "/" as hierarchy separator, the suggested names can come in very handy when dealing with large numbers of changes. </li> @@ -788,7 +788,7 @@ </p> <p>To analyze the contents of a specific commit you should use the <a href="Reference.html#History_View">History View</a> which supports this task much better, see task - <a href="Tasks.html#Inspecting_Commits">Inspecting Commits</a>. + <a href="#Inspecting_Commits">Inspecting Commits</a>. </p> <h4 id="Compare_editor_and_Git_Tree_Compare_View">Compare editor and Git Tree Compare View</h4> <p>If you use any of the submenu actions of @@ -940,7 +940,7 @@ <li>modified files (marked with ">" in front of the filename)</li> </ul> <p>For details see - <a href="Tasks.html#Label_Decorations">Label Decorations</a>. + <a href="#Label_Decorations">Label Decorations</a>. </p> <p>Here is an example in the Package Explorer for</p> <ul> @@ -1042,6 +1042,9 @@ Signed-off-by: William Shakespeare <will.from@the.past> <p> <img border="0" src="images/Egit-0.9-commit-dialog-amend.png"/> </p> + <ul> + <li>Note: UI has changed (June 2013) use toolbar in the upper right.</li> + </ul> <p>The commit message of your previous commit (the one you want to replace) is filled into the "Commit Message" field. This gives you the chance not only to correct errors in the content of the version-controlled files but to also correct errors (e.g. typos) in the commit message describing your change.</p> <p>As an alternative to amending you could just commit the corrected version as a subsequent commit. But the first commit containing the typo is of no use to anybody and in order not to clutter the history of your project with unneeded commits you should amend the commit.</p> <p>Be aware that amending commits which are already published to other repositories may cause trouble. Once you have pushed a commit to a remote repository or your local repository was cloned by somebody else, you should be very careful with amending commits. In this case publishing a second commit which corrects the first one is probably a better solution. Otherwise inform all others that you amended a published commit so that they can react accordingly.</p> @@ -1121,14 +1124,14 @@ Signed-off-by: William Shakespeare <will.from@the.past> <p>Thus, before starting to change the local repository, the first step is typically to create a local branch. Local branches are "based upon" either a commit or a remote tracking branch.</p> <p>The second option is recommended when working with remote repositories, as it simplifies the task of synchronizing the local changes with the remote ones by adding so-called "upstream configuration" to the new local branch.</p> <p>See - <a href="Tasks.html#Branch_Creation_Dialog">Branch Creation dialog</a> for more details. + <a href="#Branch_Creation_Dialog">Branch Creation dialog</a> for more details. </p> <h4 id="Upstream_configuration">Upstream configuration</h4> <p>Each local branch which is based on a local tracking branch can have some additional configuration indicating the remote repository, the remote branch, and the so-called pull strategy. See - <a href="Tasks.html#Branch_Creation_Dialog">Branch Creation dialog</a> for more details. + <a href="#Branch_Creation_Dialog">Branch Creation dialog</a> for more details. </p> <p>Typically, this configuration is created automatically when creating the local branch based on a remote tracking branch. However, it can be displayed and edited in the - <a href="Tasks.html#Repository_Configuration">repository configuration</a> or by clicking + <a href="#Repository_Configuration">repository configuration</a> or by clicking <b>Show In > Properties</b> on a branch in the Repositories View. </p> <h3 id="Checking_out_an_existing_Branch">Checking out an existing Branch</h3> @@ -1167,7 +1170,7 @@ Signed-off-by: William Shakespeare <will.from@the.past> </ul> <h3 id="Creating_a_New_Local_Branch">Creating a New Local Branch</h3> <p>This is always done with the - <a href="Tasks.html#Branch_Creation_Dialog">Branch Creation dialog</a>. The newly created branch can optionally be checked out by selecting a check box on the dialog. + <a href="#Branch_Creation_Dialog">Branch Creation dialog</a>. The newly created branch can optionally be checked out by selecting a check box on the dialog. </p> <h4 id="From_the_team_menu">From the team menu</h4> <ul> @@ -1179,7 +1182,7 @@ Signed-off-by: William Shakespeare <will.from@the.past> <b>Create Branch...</b>. </li> <li>The - <a href="Tasks.html#Branch_Creation_Dialog">Branch Creation dialog</a> will be opened. + <a href="#Branch_Creation_Dialog">Branch Creation dialog</a> will be opened. </li> </ul> <h4 id="From_the_Repositories_View">From the Repositories View</h4> @@ -1188,7 +1191,7 @@ Signed-off-by: William Shakespeare <will.from@the.past> <b>Create Branch...</b> on the "Branches" node or on any "Branch", "Tag" or "References" node. </li> <li>The - <a href="Tasks.html#Branch_Creation_Dialog">Branch Creation dialog</a> will be opened. + <a href="#Branch_Creation_Dialog">Branch Creation dialog</a> will be opened. </li> </ul> <h4 id="From_the_History_View_2">From the History View</h4> @@ -1197,7 +1200,7 @@ Signed-off-by: William Shakespeare <will.from@the.past> <b>Create Branch...</b> </li> <li>The - <a href="Tasks.html#Branch_Creation_Dialog">Branch Creation dialog</a> will be opened + <a href="#Branch_Creation_Dialog">Branch Creation dialog</a> will be opened </li> </ul> <h3 id="Renaming_an_Existing_Branch">Renaming an Existing Branch</h3> @@ -1276,7 +1279,7 @@ Signed-off-by: William Shakespeare <will.from@the.past> <li>None: When pulling, no specific upstream configuration will be done for the new branch; however, if a default remote exists (a remote with name "origin", pull will try to use the configuration of this remote; this is the default if the new branch is not based on a remote tracking branch</li> </ul> <p>You may view and edit the upstream configuration in the - <a href="Tasks.html#Repository_Configuration">repository configuration</a> or by selecting + <a href="#Repository_Configuration">repository configuration</a> or by selecting <b>Show In > Properties</b> on a branch in the Repositories View. </p> <p>EGit also supports the git configuration parameter <code>branch.autosetuprebase</code>, set it to <code>always</code> if you want to use the rebase pull strategy by default. If you set this in the repository configuration this is used for all local branches created based on a remote tracking branch in this repository, if you set it in your user configuration it will be used for all your repositories.</p> @@ -1301,7 +1304,7 @@ Signed-off-by: William Shakespeare <will.from@the.past> <p>On the dialog, select a branch or a tag you want to merge with your current branch.</p> <h4 id="Starting_merge_from_the_Git_Repositories_View">Starting merge from the Git Repositories View</h4> <p>You can trigger a merge from any branch and tag node and from the repository node if you have checked out a local branch. See - <a href="Tasks.html#Merging_a_Branch_or_a_Tag">Merging a Branch or a Tag</a> for further details. + <a href="#Merging_a_Branch_or_a_Tag">Merging a Branch or a Tag</a> for further details. </p> <h4 id="Possible_merge_results">Possible merge results</h4> <p>After pressing the Merge button, the following scenarios can occur:</p> @@ -1314,7 +1317,7 @@ Signed-off-by: William Shakespeare <will.from@the.past> </li> <li> <i>Real merge</i>: When neither of the conditions above apply egit triggers a merge of the commits. There are two possible outcomes: If no conflicts occur the current branch will point to a newly created merge commit; if conflicts occur the conflicting files will be marked with label decorators (see - <a href="Tasks.html#Resolving_a_merge_conflict">Resolving a merge conflict</a> for further actions in case of merge conflicts). + <a href="#Resolving_a_merge_conflict">Resolving a merge conflict</a> for further actions in case of merge conflicts). </li> </ul> <h5 id="Merge_Result_dialog">Merge Result dialog</h5> @@ -1407,7 +1410,7 @@ Signed-off-by: William Shakespeare <will.from@the.past> <h3 id="Aborting_Merge">Aborting Merge</h3> <p>If a merge resulted in conflicts you can abort the merge with a hard reset to the current branch. This can be done in state "Conflicts" and in state "Merged", i.e. before and after you have resolved the conflicts.</p> <p>The hard reset can be done from the team menu, the Git Repositories View or the History View. See - <a href="Tasks.html#Revert_all_local_and_staged_changes">Revert all local and staged changes</a> for more details. + <a href="#Revert_all_local_and_staged_changes">Revert all local and staged changes</a> for more details. </p> <p> <br/> @@ -1613,7 +1616,7 @@ Sein oder nicht sein </p> <ul> <li>Resolve the conflicts by editing the corresponding sources as described in - <a href="Tasks.html#Resolving_a_merge_conflict">Resolving a merge conflict</a> + <a href="#Resolving_a_merge_conflict">Resolving a merge conflict</a> </li> <li> <b>Team > Add</b> the files you edited to mark the conflicts resolved @@ -1784,7 +1787,7 @@ Sein oder nicht sein </p> <h4 id="Cloning_a_Repository_2">Cloning a Repository</h4> <p>In order to clone a Repository, refer to - <a href="Tasks.html#Cloning_a_Repository">Cloning remote Repositories</a>. After a successful clone operation, the newly cloned Repository should appear in the Git Repositories View automatically. + <a href="#Cloning_a_Repository">Cloning remote Repositories</a>. After a successful clone operation, the newly cloned Repository should appear in the Git Repositories View automatically. </p> <p>You can also use the <b>Clone a Git Repository</b> button from the view's toolbar to start the Clone wizard: @@ -1793,7 +1796,7 @@ Sein oder nicht sein <img border="0" src="images/RepoMgrCloneRepositoryIcon.png"/> </p> <p>Please refer to - <a href="Tasks.html#Cloning_a_Repository">Cloning remote Repositories</a> about how to use the wizard. + <a href="#Cloning_a_Repository">Cloning remote Repositories</a> about how to use the wizard. </p> <h4 id="Creating_a_Repository">Creating a Repository</h4> <p>You can create a new, empty repository on the local file system. This is useful if you later on want to create one or more new projects below this repository. Another usecase is to create a new bare repository where you can push to. Use the @@ -1865,7 +1868,7 @@ Sein oder nicht sein <b>Import Existing Projects</b> wizard. If the import is started from the "Repository" or the "Working Directory" node, the working directory of the repository is set as context, otherwise the directory corresponding to the currently selected "Folder" node. </p> <p>The details of project import are discussed in - <a href="Tasks.html#Use_the_New_Projects_Wizard">Use the New Projects Wizard</a>. + <a href="#Use_the_New_Projects_Wizard">Use the New Projects Wizard</a>. </p> <h4 id="Branch_and_Tag_Support">Branch and Tag Support</h4> <p>The "Branches" node allows to create, browse, checkout and delete local and remote branches. The "Tags" node allows to browse and check out tags. Both the "Branches" node and the "Tags" node allow to merge the branch or tag into the currently checked out branch and also to synchronize with the currently checked out branch.</p> @@ -1877,7 +1880,7 @@ Sein oder nicht sein <p>Branches and tags can be checked out by either double-clicking on the respective node or by selecting the corresponding context menu entry.</p> <h5 id="Creation_and_Deletion_of_Branches">Creation and Deletion of Branches</h5> <p>Local branches can be created using the - <a href="Tasks.html#Branch_Creation_Dialog">Branch Creation Dialog</a>. The wizard is opened by right-clicking on the "Branches", the "Local Branches" on any "Branch" and "Tag" node). + <a href="#Branch_Creation_Dialog">Branch Creation Dialog</a>. The wizard is opened by right-clicking on the "Branches", the "Local Branches" on any "Branch" and "Tag" node). </p> <p>Branch deletion is done using the corresponding context menu entry.</p> <h5 id="Rebasing_2">Rebasing</h5> @@ -1886,7 +1889,7 @@ Sein oder nicht sein </p> <h5 id="Merging_a_Branch_or_a_Tag">Merging a Branch or a Tag</h5> <p>You can trigger a merge from any branch and tag node and from the repository node if you have checked out a local branch. See - <a href="Tasks.html#Merging">Merging</a> for further details of the merging features. + <a href="#Merging">Merging</a> for further details of the merging features. </p> <ul> <li>When you select any branch node other than the currently checked out branch or any tag node, use @@ -1896,7 +1899,7 @@ Sein oder nicht sein <ul> <li>When you select the repository node or the currently checked out branch, use <b>Merge...</b> to open the merge dialog. The merge dialog is described at - <a href="Tasks.html#Merging_a_branch_or_a_tag_into_the_current_branch">Merging a branch or a tag into the current branch</a>. + <a href="#Merging_a_branch_or_a_tag_into_the_current_branch">Merging a branch or a tag into the current branch</a>. </li> </ul> <h5 id="Synchronizing_with_a_Branch_or_a_Tag">Synchronizing with a Branch or a Tag</h5> @@ -1911,7 +1914,7 @@ Sein oder nicht sein <h5 id="Resetting_to_a_Branch_or_a_Tag">Resetting to a Branch or a Tag</h5> <p>Right click and select <b>Reset...</b> on any branch or tag. This opens a dialog which lets you decide on the reset type. See - <a href="Tasks.html#Resetting_your_current_HEAD">Resetting you current HEAD</a> for further details. + <a href="#Resetting_your_current_HEAD">Resetting you current HEAD</a> for further details. </p> <h5 id=".22Detached.22_HEAD">"Detached" HEAD</h5> <p>If HEAD is "detached", i.e. is not pointing to the tip of a local branch but to a commit or tag, then none or several "checked-out" markers may appear in the tree, since any number of remote branch or tags may point to the currently checked out commit. The state you are in while your HEAD is detached is not recorded by any branch (which is natural --- you are not on any branch).</p> @@ -1963,11 +1966,11 @@ Sein oder nicht sein <p>The "Fetch" node contains a so called fetch specification and the "Push" node contains a so called push specification.</p> <p>A default fetch specification is created when the repository is cloned. You can edit the fetch specification with the menu entry <b>Configure Fetch...</b>. This opens a wizard. On the first page you can edit the Fetch URI. Ob the second page you can determine the fetch ref specifications, see - <a href="Tasks.html#Fetch_Ref_Specifications">Fetch Ref Specifications</a>. + <a href="#Fetch_Ref_Specifications">Fetch Ref Specifications</a>. </p> <p>You can create or edit a push specification with the menu entry <b>Configure Push...</b>. This opens a wizard. On the first page you can edit the Push URIs. If a fetch is specified the fetch URI is automatically included into the push specification and no additional Push URI is needed. On the second page you can determine the push ref specifications, see - <a href="Tasks.html#Push_Ref_Specifications">Push Ref Specifications</a>. + <a href="#Push_Ref_Specifications">Push Ref Specifications</a>. </p> <h5 id="Adding_a_Remote_Configuration">Adding a Remote Configuration</h5> <p>This is done using a context menu action on the "Remotes" node. A wizard is started asking for the name of the new configuration and whether to configure Fetch, Push, or both:</p> @@ -1982,7 +1985,7 @@ Sein oder nicht sein </p> <p>Click <b>Change...</b> to open a dialog that allows you to select a URI. The next step is to define the Remote Specification for the fetch URI. See - <a href="Tasks.html#Fetch_Ref_Specifications">Fetch Ref Specifications</a> about the details. + <a href="#Fetch_Ref_Specifications">Fetch Ref Specifications</a> about the details. </p> <p>If the <b>Configure Push</b> checkbox was selected, the next wizard page will ask for the URIs of the repositories to push to. This is actually a list, as you can push to multiple repositories at once. Click @@ -1994,7 +1997,7 @@ Sein oder nicht sein <img border="0" src="images/Egit-0.9-repo-view-createRemoteWizardPush.png"/> </p> <p>The next step is to define the Remote Specification for the push URIs. See - <a href="Tasks.html#Push_Ref_Specifications">Push Ref Specifications</a> about the details. + <a href="#Push_Ref_Specifications">Push Ref Specifications</a> about the details. </p> <p>Upon completion, the new Remote configuration will be visible:</p> <p> @@ -2099,7 +2102,7 @@ Sein oder nicht sein <h4 id="Show_in_Properties">Show in Properties</h4> <p>The command <b>Show in > Properties</b> will open the - <a href="Tasks.html#Repository_Configuration">Properties view</a> showing the properties of the selected repository. + <a href="#Repository_Configuration">Properties view</a> showing the properties of the selected repository. </p> <p> <br/> @@ -2211,10 +2214,10 @@ Sein oder nicht sein <li>History view table context menu</li> <li>Double-clicking commits in the Pull/Fetch dialog results table</li> <li> - <a href="Tasks.html#Open_commit_dialog">Open commit dialog</a> + <a href="#Open_commit_dialog">Open commit dialog</a> </li> <li> - <a href="Tasks.html#Finding_the_author_of_each_line_in_a_file">Blame annotation popup</a> + <a href="#Finding_the_author_of_each_line_in_a_file">Blame annotation popup</a> </li> <li> <a href="#Reflog_View">Reflog View</a> @@ -2232,7 +2235,7 @@ Sein oder nicht sein </p> <h3 id="Browsing_Search_Results">Browsing Search Results</h3> <p>Commit search results are displayed in the standard Eclipse Search view. Results are grouped by repository when in Tree mode. Double-clicking a commit from the Search view will open it in the - <a href="Tasks.html#Viewing_Commits">commit viewer</a>. + <a href="#Viewing_Commits">commit viewer</a>. </p> <p> <img border="0" src="images/Git-search-results.png"/> @@ -2272,7 +2275,7 @@ Sein oder nicht sein <img border="0" src="images/Egit-1.0-blame-ruler.png"/> </p> <p>Selecting the SHA-1 hyperlink from the popup will open the commit in the - <a href="Tasks.html#Viewing_Commits">commit viewer</a>. + <a href="#Viewing_Commits">commit viewer</a>. </p> <h2 id="Working_with_Submodules">Working with Submodules</h2> <p>Submodule support in EGit/JGit was added in the 1.3 release that was part of Indigo SR2 in February 2011.</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 87243d2785..3084f25cc8 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 @@ -31,7 +31,7 @@ <a href="../../EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html" title="EGit/Git For Eclipse Users">Git for Eclipse Users</a> first. More background and details can be found in the on-line book <a href="http://progit.org/book/" target="egit_external">Pro Git</a>. </p> - <p>If there you are coming from CVS, you can find common CVS workflows for Git + <p>If you are coming from CVS, you can find common CVS workflows for Git <a href="http://wiki.eclipse.org/Platform-releng/Git_Workflows" title="Platform-releng/Git Workflows" target="egit_external">Platform-releng/Git Workflows</a>. </p> <h2 id="Basic_Tutorial:_Adding_a_project_to_version_control">Basic Tutorial: Adding a project to version control</h2> diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/2.3/Performance-Improvements.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/2.3/Performance-Improvements.html deleted file mode 100644 index a1d69be6ab..0000000000 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/2.3/Performance-Improvements.html +++ /dev/null @@ -1,62 +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 2.3 New and Noteworthy - Performance Improvements</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">Performance Improvements</th> - </tr> - <tr> - <td style="width: 20%" align="left"> - <a href="2.3.html" title="JGit 2.3 New and Noteworthy"> - <img alt="Previous" border="0" src="../../../images/prev.gif"/> - </a> - </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">JGit 2.3 New and Noteworthy</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Bug Fixes</td> - </tr> - </table><hr/> - <h1 id="Performance_Improvements">Performance Improvements</h1> - <ul> - <li>Speed up handling of paths in the CommitCommand</li> - <li>Speed up PathFilterGroup for large sets of paths</li> - </ul><hr/> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <td style="width: 20%" align="left"> - <a href="2.3.html" title="JGit 2.3 New and Noteworthy"> - <img alt="Previous" border="0" src="../../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"> - <a href="2.3.html" title="JGit 2.3 New and Noteworthy"> - <img alt="JGit 2.3 New and Noteworthy" border="0" src="../../../images/home.gif"/> - </a> - </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">JGit 2.3 New and Noteworthy</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/2.3/2.3.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.0/3.0.html index 6f3e35287a..d6e260f20d 100644 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/2.3/2.3.html +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.0/3.0.html @@ -2,19 +2,19 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>JGit 2.3 New and Noteworthy</title> + <title>JGit 3.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 2.3 New and Noteworthy</th> + <th style="width: 100%" align="center" colspan="3">JGit 3.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="Performance-Improvements.html" title="Performance Improvements"> + <a href="Commands.html" title="Commands"> <img alt="Next" border="0" src="../../../images/next.gif"/> </a> </td> @@ -22,22 +22,21 @@ <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">Performance Improvements</td> + <td style="width: 20%" align="right" valign="top">Commands</td> </tr> </table><hr/> <h1 id="Features">Features</h1> - <ul> - <li>Deleted the iplog generator, it was replaced by the automatic IP tool provided by Eclipse Foundation</li> - <li>New tree filter for user-visible changes between two indexes</li> - <li>Improved handling of Gerrit ChangeIds</li> - <li>Improved handling of checkout conflicts</li> - </ul><hr/> + <h2 id="Recursive_Merge">Recursive Merge</h2> + <p>JGit now supports the "recursive" merge strategy and it's the default for merge/pull ( + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=380314" target="egit_external">bug 380314</a>). It is based on the "resolve" strategy but can handle more than one merge base. See + <a href="http://git-scm.com/docs/git-merge#_merge_strategies" target="egit_external">merge strategies</a> in the Git documentation for a description. + </p><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="Performance-Improvements.html" title="Performance Improvements"> + <a href="Commands.html" title="Commands"> <img alt="Next" border="0" src="../../../images/next.gif"/> </a> </td> @@ -45,7 +44,7 @@ <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">Performance Improvements</td> + <td style="width: 20%" align="right" valign="top">Commands</td> </tr> </table> </body> diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.0/API-Changes-and-Migration-Hints.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.0/API-Changes-and-Migration-Hints.html new file mode 100644 index 0000000000..60f941f1c6 --- /dev/null +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.0/API-Changes-and-Migration-Hints.html @@ -0,0 +1,94 @@ +<?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 3.0 New and Noteworthy - API Changes and Migration Hints</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">API Changes and Migration Hints</th> + </tr> + <tr> + <td style="width: 20%" align="left"> + <a href="Performance-Improvements.html" title="Performance Improvements"> + <img alt="Previous" border="0" src="../../../images/prev.gif"/> + </a> + </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">Performance Improvements</td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Bug Fixes</td> + </tr> + </table><hr/> + <h1 id="API_Changes_and_Migration_Hints">API Changes and Migration Hints</h1> + <p>Details of API changes in 3.0 compared to the previous release 2.3.1 are available in the Clirr API change report linked from the + <a href="http://www.eclipse.org/jgit/download/" target="egit_external">JGit download page</a>. + </p> + <h3 id="Internal_storage_API_moved_to_internal_packages">Internal storage API moved to internal packages</h3> + <p>Applications are not supposed to build against the internal storage API unless they can accept API churn and make necessary updates as versions change.</p> + <ul> + <li>package org.eclipse.jgit.storage.dfs was moved to org.eclipse.jgit.internal.storage.dfs</li> + <li>package org.eclipse.jgit.storage.file was moved to org.eclipse.jgit.internal.storage.file</li> + </ul> + <p>In order to construct specific Repository instances use the respective builder classes:</p> + <ul> + <li>org.eclipse.jgit.storage.file.FileRepositoryBuilder</li> + <li>org.eclipse.jgit.internal.storage.dfs.DfsRepositoryBuilder</li> + </ul> + <h3 id="WindowCache_reconfiguration">WindowCache reconfiguration</h3> + <p>Instead of </p> + <pre style="width: 55em;"> +WindowCacheConfig c = new WindowCacheConfig(); +... set new configuration params ... +WindowCache.reconfigure(c); +</pre> + <p>use</p> + <pre style="width: 55em;"> +WindowCacheConfig c = new WindowCacheConfig(); +... set new configuration params ... +WIndowCacheConfig.install() +</pre> + <h3 id="FollowFilter_requires_DiffConfig">FollowFilter requires DiffConfig</h3> + <p>Creation of a FollowFilter now needs an explicit DiffConfig, this was necessary to fix an NPE (see + <a href="https://git.eclipse.org/r/#/c/12499" target="egit_external">https://git.eclipse.org/r/#/c/12499</a>) + </p> + <pre style="width: 55em;"> +public static FollowFilter create(String path, DiffConfig cfg) +</pre> + <h3 id="Reflog_interfaces_moved">Reflog interfaces moved</h3> + <p>The interfaces ReflogReader and ReflogEntry exposed by ReflogCommand and Repository were moved to package org.eclipse.jgit.lib.</p><hr/> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <td style="width: 20%" align="left"> + <a href="Performance-Improvements.html" title="Performance Improvements"> + <img alt="Previous" border="0" src="../../../images/prev.gif"/> + </a> + </td> + <td style="width: 60%" align="center"> + <a href="3.0.html" title="JGit 3.0 New and Noteworthy"> + <img alt="JGit 3.0 New and Noteworthy" border="0" src="../../../images/home.gif"/> + </a> + </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">Performance Improvements</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/2.3/Bug-Fixes.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.0/Bug-Fixes.html index 815a78c33b..2239f54298 100644 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/2.3/Bug-Fixes.html +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.0/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 2.3 New and Noteworthy - Bug Fixes</title> + <title>JGit 3.0 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="Performance-Improvements.html" title="Performance Improvements"> + <a href="API-Changes-and-Migration-Hints.html" title="API Changes and Migration Hints"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> @@ -24,25 +24,30 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">Performance Improvements</td> + <td style="width: 20%" align="left" valign="top">API Changes and Migration Hints</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> + <ul> + <li>Repository corruption after running gc twice (Windows only) ( + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=389305" target="egit_external">bug 389305</a>) + </li> + </ul> <p> - <a href="https://bugs.eclipse.org/bugs/buglist.cgi?list_id=3805932&resolution=FIXED&resolution=DUPLICATE&classification=Technology&chfieldto=2013-02-22&chfield=resolution&query_format=advanced&chfieldfrom=2012-12-20&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&product=EGit" target="egit_external">54 Bugs and 4 enhancement requests</a> were closed + <a href="https://bugs.eclipse.org/bugs/buglist.cgi?resolution=FIXED&resolution=DUPLICATE&classification=Technology&chfieldto=2013-06-10&query_format=advanced&chfield=bug_status&chfieldfrom=2013-02-20&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&product=JGit&target_milestone=3.0" target="egit_external">18 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="Performance-Improvements.html" title="Performance Improvements"> + <a href="API-Changes-and-Migration-Hints.html" title="API Changes and Migration Hints"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> <td style="width: 60%" align="center"> - <a href="2.3.html" title="EGit 2.3 New and Noteworthy"> - <img alt="EGit 2.3 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="3.0.html" title="JGit 3.0 New and Noteworthy"> + <img alt="JGit 3.0 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"> @@ -52,7 +57,7 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">Performance Improvements</td> + <td style="width: 20%" align="left" valign="top">API Changes and Migration Hints</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/3.0/Command-Line.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.0/Command-Line.html new file mode 100644 index 0000000000..c3ad54d5c8 --- /dev/null +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.0/Command-Line.html @@ -0,0 +1,75 @@ +<?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 3.0 New and Noteworthy - Command Line</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">Command Line</th> + </tr> + <tr> + <td style="width: 20%" align="left"> + <a href="Library.html" title="Library"> + <img alt="Previous" border="0" src="../../../images/prev.gif"/> + </a> + </td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right"> + <a href="Performance-Improvements.html" title="Performance Improvements"> + <img alt="Next" border="0" src="../../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top">Library</td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Performance Improvements</td> + </tr> + </table><hr/> + <h1 id="Command_Line">Command Line</h1> + <ul> + <li>Clone command + <ul> + <li>Added <tt>--branch</tt> (<tt>-b</tt>) option for checking out a specific branch instead of HEAD in non-bare repository</li> + </ul> + </li> + <li>Merge command + <ul> + <li>Add <tt>--no-commit</tt> option for merging but not committing the result</li> + </ul> + </li> + <li>Status command + <ul> + <li>Show conflict description for unmerged paths (e.g. "both modified")</li> + </ul> + </li> + </ul><hr/> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <td style="width: 20%" align="left"> + <a href="Library.html" title="Library"> + <img alt="Previous" border="0" src="../../../images/prev.gif"/> + </a> + </td> + <td style="width: 60%" align="center"> + <a href="3.0.html" title="JGit 3.0 New and Noteworthy"> + <img alt="JGit 3.0 New and Noteworthy" border="0" src="../../../images/home.gif"/> + </a> + </td> + <td style="width: 20%" align="right"> + <a href="Performance-Improvements.html" title="Performance Improvements"> + <img alt="Next" border="0" src="../../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top">Library</td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Performance Improvements</td> + </tr> + </table> + </body> +</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.0/Commands.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.0/Commands.html new file mode 100644 index 0000000000..8f3c9b3406 --- /dev/null +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.0/Commands.html @@ -0,0 +1,80 @@ +<?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 3.0 New and Noteworthy - Commands</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">Commands</th> + </tr> + <tr> + <td style="width: 20%" align="left"> + <a href="3.0.html" title="JGit 3.0 New and Noteworthy"> + <img alt="Previous" border="0" src="../../../images/prev.gif"/> + </a> + </td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right"> + <a href="Library.html" title="Library"> + <img alt="Next" border="0" src="../../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top">JGit 3.0 New and Noteworthy</td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Library</td> + </tr> + </table><hr/> + <h1 id="Commands">Commands</h1> + <p>(not to be confused with Command Line below)</p> + <ul> + <li>Add <tt>NameRevCommand</tt> for describing IDs in terms of refnames ( + <a href="https://git.eclipse.org/r/r/I92bfb47dd16c898313d2ee525395609c3bf72ebe" target="egit_external">change I92bfb47</a>). + </li> + <li>Add <tt>ArchiveCommand</tt> for creating an archive file for a tree</li> + <li><tt>TagCommand</tt> now also supports creating simple unannotated (lightweight) tags ( + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=349223" target="egit_external">bug 349223</a>). + </li> + <li><tt>RebaseCommand</tt> supports aborting a non-interactive rebase started from C Git ( + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=336820" target="egit_external">bug 336820</a>). + </li> + <li><tt>MergeCommand</tt> now has a <tt>setCommit(boolean)</tt> method which can be used to merge but not yet commit the result ( + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=335091" target="egit_external">bug 335091</a>). + </li> + <li><tt>StashCreateCommand</tt> considers working tree changes when stashing newly added files ( + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=402396" target="egit_external">bug 402396</a>). + </li> + <li><tt>StashCreateCommand</tt> no longer stashes untracked files ( + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=403282" target="egit_external">bug 403282</a>). + </li> + </ul><hr/> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <td style="width: 20%" align="left"> + <a href="3.0.html" title="JGit 3.0 New and Noteworthy"> + <img alt="Previous" border="0" src="../../../images/prev.gif"/> + </a> + </td> + <td style="width: 60%" align="center"> + <a href="3.0.html" title="JGit 3.0 New and Noteworthy"> + <img alt="JGit 3.0 New and Noteworthy" border="0" src="../../../images/home.gif"/> + </a> + </td> + <td style="width: 20%" align="right"> + <a href="Library.html" title="Library"> + <img alt="Next" border="0" src="../../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top">JGit 3.0 New and Noteworthy</td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Library</td> + </tr> + </table> + </body> +</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/2.3/Contributors.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.0/Contributors.html index ca895008b4..25c1e8d1d5 100644 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/2.3/Contributors.html +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.0/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 2.3 New and Noteworthy - Contributors</title> + <title>JGit 3.0 New and Noteworthy - Contributors</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> @@ -30,8 +30,26 @@ </tr> </table><hr/> <h1 id="Contributors">Contributors</h1> - <p>The following 12 developers worked on this release of JGit:</p> - <p>Christian Halstrick, Colby Ranger, Dani Megert, Dave Borowitz, Markus Duft, Matthias Sohn, Robin Rosenberg, Robin Stocker, Shawn Pearce, Stefan Lay, Tobias Pfeifer, Tomasz Zarna</p><hr/> + <p>The following 19 developers worked on this release of JGit:</p> + <p>Alex Blewitt, + Andreas König, + André Dietisheim, + Arthur Baars, + Christian Halstrick, + Colby Ranger, + Dave Borowitz, + Edwin Kempin, + François Rey, + George C. Young, + Gustaf Lundh, + Jonathan Nieder, + Matthias Sohn, + Roberto Tyley, + Robin Rosenberg, + Robin Stocker, + Shawn Pearce, + Stefan Lay, + Tomasz Zarna</p><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"> @@ -40,8 +58,8 @@ </a> </td> <td style="width: 60%" align="center"> - <a href="2.3.html" title="JGit 2.3 New and Noteworthy"> - <img alt="JGit 2.3 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="3.0.html" title="JGit 3.0 New and Noteworthy"> + <img alt="JGit 3.0 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/3.0/Library.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.0/Library.html new file mode 100644 index 0000000000..969b13270e --- /dev/null +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.0/Library.html @@ -0,0 +1,100 @@ +<?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 3.0 New and Noteworthy - Library</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">Library</th> + </tr> + <tr> + <td style="width: 20%" align="left"> + <a href="Commands.html" title="Commands"> + <img alt="Previous" border="0" src="../../../images/prev.gif"/> + </a> + </td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right"> + <a href="Command-Line.html" title="Command Line"> + <img alt="Next" border="0" src="../../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top">Commands</td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Command Line</td> + </tr> + </table><hr/> + <h1 id="Library">Library</h1> + <ul> + <li>Add <tt>isRebasing</tt> to <tt>RepositoryState</tt> for checking whether the repository is in a rebasing state.</li> + <li>Don't verify host name when <tt>http.sslVerify</tt> is set to <tt>false</tt> ( + <a href="https://git.eclipse.org/r/r/I42f509fea8e4ac89fad646aec3dfbf1753ae7e3d" target="egit_external">change I42f509f</a>). + </li> + <li>Allow to provide OutputStream for push so that server messages can be written to it while they're coming in ( + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=398404" target="egit_external">bug 398404</a>). + </li> + <li><tt>IndexDiff</tt> provides stage information for conflicting entries, e.g. <tt>BOTH_MODIFIED</tt> ( + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=403697" target="egit_external">bug 403697</a>). + </li> + <li>Behave more like C Git when fetching tags by not updating existing tags unless explicitly specified ( + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=388095" target="egit_external">bug 388095</a>). + </li> + <li>Basic Java 7 support ( + <a href="https://git.eclipse.org/r/#/c/9378/" target="egit_external">change I3d6580d</a>). Internal only (read: symlink support not visisble) + </li> + <li>Fix GC which could corrupt repository on Windows if run twice on the exact same repository content ( + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=389305" target="egit_external">bug 389305</a>). + </li> + <li>Fix internal "Delete" errors on Windows with checkout/reset, etc ( + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=403685" target="egit_external">bug 403685</a>). + </li> + <li>Fix <tt>Rebase/Cherry</tt> pick failing because/when new directory already exists ( + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=402834" target="egit_external">bug 402834</a>). + </li> + <li>Fix <tt>Amend</tt> of merge commit to not reverse parent order ( + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=392670" target="egit_external">bug 392670</a>). + </li> + <li>Fix <tt>TreeFilter</tt> if one folder name is a prefix of another folder ( + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=362430" target="egit_external">bug 362430</a>). + </li> + <li>Fix 8000 byte file checking out as zero byte file if <tt>core.autocrlf</tt> = <tt>true</tt> ( + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=405672" target="egit_external">bug 405672</a>). + </li> + <li>Fix NPE in <tt>DiffFormatter</tt> when DiffEntry.oldId is null ( + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=407743" target="egit_external">bug 407743</a>). + </li> + <li>Do not cherry-pick merge commits during rebase ( + <a href="https://git.eclipse.org/r/#/c/10548/" target="egit_external">change I61239d2</a>). + </li> + </ul><hr/> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <td style="width: 20%" align="left"> + <a href="Commands.html" title="Commands"> + <img alt="Previous" border="0" src="../../../images/prev.gif"/> + </a> + </td> + <td style="width: 60%" align="center"> + <a href="3.0.html" title="JGit 3.0 New and Noteworthy"> + <img alt="JGit 3.0 New and Noteworthy" border="0" src="../../../images/home.gif"/> + </a> + </td> + <td style="width: 20%" align="right"> + <a href="Command-Line.html" title="Command Line"> + <img alt="Next" border="0" src="../../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top">Commands</td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Command Line</td> + </tr> + </table> + </body> +</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.0/Performance-Improvements.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.0/Performance-Improvements.html new file mode 100644 index 0000000000..eca2653870 --- /dev/null +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.0/Performance-Improvements.html @@ -0,0 +1,74 @@ +<?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 3.0 New and Noteworthy - Performance Improvements</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">Performance Improvements</th> + </tr> + <tr> + <td style="width: 20%" align="left"> + <a href="Command-Line.html" title="Command Line"> + <img alt="Previous" border="0" src="../../../images/prev.gif"/> + </a> + </td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right"> + <a href="API-Changes-and-Migration-Hints.html" title="API Changes and Migration Hints"> + <img alt="Next" border="0" src="../../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top">Command Line</td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">API Changes and Migration Hints</td> + </tr> + </table><hr/> + <h1 id="Performance_Improvements">Performance Improvements</h1> + <ul> + <li>New bitmap pack index created during JGit GC speeds up clone/fetch. With this new index type JGit can now serve Git repositories considerably faster than C Git.</li> + <li>DateRevQueue (used by RevWalk) is faster for many commits ( + <a href="https://git.eclipse.org/r/r/Ie7b99f40eacf6324bfb4716d82073adeda64d10f" target="egit_external">change Ie7b99f4</a>). + </li> + <li>When using both C Git and JGit and <tt>core.checkstat</tt> is set to <tt>minimal</tt>, Git no longer has to revalidate a large number of files ( + <a href="https://git.eclipse.org/r/r/I8eaff1858a891571075a86db043f9d80da3d7503" target="egit_external">change I8eaff18</a>). + </li> + <li>Updating many existing refs is faster as the unnecessary check for ref name conflicts is no longer done ( + <a href="https://git.eclipse.org/r/r/I9057bc4ee22f9cc269b1cc00c493841c71527cd6" target="egit_external">change I9057bc4</a>). + </li> + <li>Speed up clone/fetch with large number of refs ( + <a href="https://git.eclipse.org/r/r/I17d0b3ccc27f868c8497607d8e57bf7082e65ba3" target="egit_external">change I17d0b3c</a>). + </li> + <li>Various improvements to packing/delta compression</li> + </ul><hr/> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <td style="width: 20%" align="left"> + <a href="Command-Line.html" title="Command Line"> + <img alt="Previous" border="0" src="../../../images/prev.gif"/> + </a> + </td> + <td style="width: 60%" align="center"> + <a href="3.0.html" title="JGit 3.0 New and Noteworthy"> + <img alt="JGit 3.0 New and Noteworthy" border="0" src="../../../images/home.gif"/> + </a> + </td> + <td style="width: 20%" align="right"> + <a href="API-Changes-and-Migration-Hints.html" title="API Changes and Migration Hints"> + <img alt="Next" border="0" src="../../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top">Command Line</td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">API Changes and Migration Hints</td> + </tr> + </table> + </body> +</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/2.3/Updating-This-Document.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.0/Updating-This-Document.html index f3a3f43304..09baf316c7 100644 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/2.3/Updating-This-Document.html +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.0/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 2.3 New and Noteworthy - Updating This Document</title> + <title>JGit 3.0 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/2.3" target="egit_external">http://wiki.eclipse.org/JGit/New_and_Noteworthy/2.3</a> + <a href="http://wiki.eclipse.org/JGit/New_and_Noteworthy/3.0" target="egit_external">http://wiki.eclipse.org/JGit/New_and_Noteworthy/3.0</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="2.3.html" title="JGit 2.3 New and Noteworthy"> - <img alt="JGit 2.3 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="3.0.html" title="JGit 3.0 New and Noteworthy"> + <img alt="JGit 3.0 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 ec6a33eb38..ba831aa138 100644 --- a/org.eclipse.egit.doc/help/toc.xml +++ b/org.eclipse.egit.doc/help/toc.xml @@ -419,20 +419,36 @@ </topic> <topic href="help/JGit/User_Guide/Updating-This-Document.html" label="Updating This Document"></topic> </topic> - <topic href="help/EGit/New_and_Noteworthy/2.3/2.3.html" label="EGit 2.3 New and Noteworthy"> - <topic href="help/EGit/New_and_Noteworthy/2.3/2.3.html" label="Features"></topic> - <topic href="help/EGit/New_and_Noteworthy/2.3/API-changes.html" label="API changes"></topic> - <topic href="help/EGit/New_and_Noteworthy/2.3/Performance-Improvements.html" label="Performance Improvements"></topic> - <topic href="help/EGit/New_and_Noteworthy/2.3/Bug-Fixes.html" label="Bug Fixes"></topic> - <topic href="help/EGit/New_and_Noteworthy/2.3/Contributors.html" label="Contributors"></topic> - <topic href="help/EGit/New_and_Noteworthy/2.3/Updating-This-Document.html" label="Updating This Document"></topic> + <topic href="help/EGit/New_and_Noteworthy/3.0/3.0.html" label="EGit 3.0 New and Noteworthy"> + <topic href="help/EGit/New_and_Noteworthy/3.0/3.0.html" label="EGit Features"> + <topic href="help/EGit/New_and_Noteworthy/3.0/3.0.html#Rename_Detection" label="Rename Detection"></topic> + <topic href="help/EGit/New_and_Noteworthy/3.0/3.0.html#Reset_to_Expression" label="Reset to Expression"></topic> + <topic href="help/EGit/New_and_Noteworthy/3.0/3.0.html#Other" label="Other"></topic> + </topic> + <topic href="help/EGit/New_and_Noteworthy/3.0/GitHub-Connector-Features.html" label="GitHub Connector Features"></topic> + <topic href="help/EGit/New_and_Noteworthy/3.0/Performance-Improvements.html" label="Performance Improvements"></topic> + <topic href="help/EGit/New_and_Noteworthy/3.0/Bug-Fixes.html" label="Bug Fixes"></topic> + <topic href="help/EGit/New_and_Noteworthy/3.0/API-changes.html" label="API changes"></topic> + <topic href="help/EGit/New_and_Noteworthy/3.0/Contributors.html" label="Contributors"></topic> + <topic href="help/EGit/New_and_Noteworthy/3.0/Updating-This-Document.html" label="Updating This Document"></topic> </topic> - <topic href="help/JGit/New_and_Noteworthy/2.3/2.3.html" label="JGit 2.3 New and Noteworthy"> - <topic href="help/JGit/New_and_Noteworthy/2.3/2.3.html" label="Features"></topic> - <topic href="help/JGit/New_and_Noteworthy/2.3/Performance-Improvements.html" label="Performance Improvements"></topic> - <topic href="help/JGit/New_and_Noteworthy/2.3/Bug-Fixes.html" label="Bug Fixes"></topic> - <topic href="help/JGit/New_and_Noteworthy/2.3/Contributors.html" label="Contributors"></topic> - <topic href="help/JGit/New_and_Noteworthy/2.3/Updating-This-Document.html" label="Updating This Document"></topic> + <topic href="help/JGit/New_and_Noteworthy/3.0/3.0.html" label="JGit 3.0 New and Noteworthy"> + <topic href="help/JGit/New_and_Noteworthy/3.0/3.0.html" label="Features"> + <topic href="help/JGit/New_and_Noteworthy/3.0/3.0.html#Recursive_Merge" label="Recursive Merge"></topic> + </topic> + <topic href="help/JGit/New_and_Noteworthy/3.0/Commands.html" label="Commands"></topic> + <topic href="help/JGit/New_and_Noteworthy/3.0/Library.html" label="Library"></topic> + <topic href="help/JGit/New_and_Noteworthy/3.0/Command-Line.html" label="Command Line"></topic> + <topic href="help/JGit/New_and_Noteworthy/3.0/Performance-Improvements.html" label="Performance Improvements"></topic> + <topic href="help/JGit/New_and_Noteworthy/3.0/API-Changes-and-Migration-Hints.html" label="API Changes and Migration Hints"> + <topic href="help/JGit/New_and_Noteworthy/3.0/API-Changes-and-Migration-Hints.html#Internal_storage_API_moved_to_internal_packages" label="Internal storage API moved to internal packages"></topic> + <topic href="help/JGit/New_and_Noteworthy/3.0/API-Changes-and-Migration-Hints.html#WindowCache_reconfiguration" label="WindowCache reconfiguration"></topic> + <topic href="help/JGit/New_and_Noteworthy/3.0/API-Changes-and-Migration-Hints.html#FollowFilter_requires_DiffConfig" label="FollowFilter requires DiffConfig"></topic> + <topic href="help/JGit/New_and_Noteworthy/3.0/API-Changes-and-Migration-Hints.html#Reflog_interfaces_moved" label="Reflog interfaces moved"></topic> + </topic> + <topic href="help/JGit/New_and_Noteworthy/3.0/Bug-Fixes.html" label="Bug Fixes"></topic> + <topic href="help/JGit/New_and_Noteworthy/3.0/Contributors.html" label="Contributors"></topic> + <topic href="help/JGit/New_and_Noteworthy/3.0/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> |
