diff options
| author | Matthias Sohn | 2013-12-18 10:08:39 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2013-12-18 14:43:18 +0000 |
| commit | f5eb293d9586c546cdbdb9db5c9c9e47ef80711d (patch) | |
| tree | 3a7e755e14e5091302a4341c1a5b0bc3b8cedb8d | |
| parent | bdd49fcbd45774b9abd28d288a0c29523337eb84 (diff) | |
| download | egit-f5eb293d9586c546cdbdb9db5c9c9e47ef80711d.tar.gz egit-f5eb293d9586c546cdbdb9db5c9c9e47ef80711d.tar.xz egit-f5eb293d9586c546cdbdb9db5c9c9e47ef80711d.zip | |
Update documentation for 3.2.0
Change-Id: Ic8d53ee29761c74ca474e32f7d494e8f187c9886
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
55 files changed, 352 insertions, 400 deletions
diff --git a/org.eclipse.egit.doc/build-help.xml b/org.eclipse.egit.doc/build-help.xml index b83da48cd9..2d95bab5c2 100644 --- a/org.eclipse.egit.doc/build-help.xml +++ b/org.eclipse.egit.doc/build-help.xml @@ -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/3.1" title="EGit 3.1 New and Noteworthy" /> - <path name="JGit/New_and_Noteworthy/3.1" title="JGit 3.1 New and Noteworthy" /> + <path name="EGit/New_and_Noteworthy/3.2" title="EGit 3.2 New and Noteworthy" /> + <path name="JGit/New_and_Noteworthy/3.2" title="JGit 3.2 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/3.1/3.1.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/3.1.html deleted file mode 100644 index b93be41999..0000000000 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/3.1.html +++ /dev/null @@ -1,109 +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 3.1 New and Noteworthy</title> - <link type="text/css" rel="stylesheet" href="../../../book.css"/> - </head> - <body> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <th style="width: 100%" align="center" colspan="3">EGit 3.1 New and Noteworthy</th> - </tr> - <tr> - <td style="width: 20%" align="left"></td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right"> - <a href="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">EGit</h1> - <h2 id="Features">Features</h2> - <ul> - <li>Allow incremental project set import</li> - <li>Support Mylyn links in History View, Staging View and Commit Dialog</li> - </ul> - <p> - <img border="0" src="images/Hyperlink-staging-egit-3.1.png"/> - </p> - <ul> - <li>History View now follows renames by default</li> - <li>Add option for --no-commit in merge dialog</li> - </ul> - <p> - <img border="0" src="images/Merge-options-egit-3.1.png"/> - </p> - <ul> - <li>Allow user to configure decoration of ignored resources</li> - <li>Ask whether to remove/delete repository when pressing delete in repositories view</li> - <li>Make "Delete Repository..." in Repositories View more explicit</li> - </ul> - <p> - <img border="0" src="images/Delete-repository-egit-3.1.png"/> - </p> - <ul> - <li>Only show Gerrit menu entries when Gerrit is configured for a repository</li> - <li>Cleanup ordering of Git menus</li> - <li>Improve usability of "Create New Tag" dialog</li> - <li>Enable restrained synchronization</li> - <li>Use the same code for all comparison actions, making sure that a comparison launches a synchronization instead when there is more than a single resource to compare (either when the user selected more than one resource or when the selected resource is part of a larger logical model).</li> - <li>Show Gerrit icon in Repositories View for repositories configured for Gerrit</li> - </ul> - <p> - <img border="0" src="images/Gerrit-repoview-egit-3.1.png"/> - </p> - <ul> - <li>Offer to create local branch when attempting to check out remote-tracking branch</li> - </ul> - <p> - <img border="0" src="images/Checkout-remotetracking-egit-3.1.png"/> - </p> - <ul> - <li>Include annotated tags with "Show All Branches and Tags" in History View</li> - </ul> - <h2 id="Staging_View">Staging View</h2> - <ul> - <li>Move commit-related buttons to "Commit Message" section of Staging View</li> - <li>Add file filtering to the Staging View toolbar</li> - </ul> - <p> - <img border="0" src="images/Staging-filter-egit-3.1.png"/> - </p> - <ul> - <li>Add presentation options (list, tree, compact tree) to Staging View (in the view menu opened from the triangle)</li> - </ul> - <p> - <img border="0" src="images/Staging-presentation-options-egit-3.1.png"/> - </p> - <ul> - <li>Show rebase buttons if rebase is in progress</li> - </ul> - <p> - <img border="0" src="images/Staging-rebase-egit-3.1.png"/> - </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="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/EGit/New_and_Noteworthy/3.1/Build-and-Release-Engineering.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/Build-and-Release-Engineering.html deleted file mode 100644 index ebf9812b7f..0000000000 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/Build-and-Release-Engineering.html +++ /dev/null @@ -1,64 +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 3.1 New and Noteworthy - Build and Release Engineering</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">Build and Release Engineering</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="Build_and_Release_Engineering">Build and Release Engineering</h1> - <ul> - <li>Update build to use Tycho 0.18</li> - <li>Update target platform to use Jetty 7.6.11</li> - <li>Update to Orbit Kepler SR1 release R20130827064939</li> - <li>Update build to use CBI jarsigner plugin</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"> - <img alt="Previous" border="0" src="../../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"> - <a href="3.1.html" title="EGit 3.1 New and Noteworthy"> - <img alt="EGit 3.1 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/3.1/GitHub-Connector-Features.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/GitHub-Connector-Features.html deleted file mode 100644 index e6d3b8095f..0000000000 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/GitHub-Connector-Features.html +++ /dev/null @@ -1,59 +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 3.1 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">GitHub Connector Features</th> - </tr> - <tr> - <td style="width: 20%" align="left"> - <a href="3.1.html" title="EGit 3.1 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="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">EGit 3.1 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="GitHub_Connector_Features">GitHub Connector Features</h1> - <p>No new features in this release.</p><hr/> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <td style="width: 20%" align="left"> - <a href="3.1.html" title="EGit 3.1 New and Noteworthy"> - <img alt="Previous" border="0" src="../../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"> - <a href="3.1.html" title="EGit 3.1 New and Noteworthy"> - <img alt="EGit 3.1 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">EGit 3.1 New and Noteworthy</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/EGit/New_and_Noteworthy/3.1/Performance-Improvements.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/Performance-Improvements.html deleted file mode 100644 index ef88629512..0000000000 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/Performance-Improvements.html +++ /dev/null @@ -1,63 +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 3.1 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="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"></td> - <td style="width: 20%" align="right"> - <a href="Build-and-Release-Engineering.html" title="Build and Release Engineering"> - <img alt="Next" border="0" src="../../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <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">Build and Release Engineering</td> - </tr> - </table><hr/> - <h1 id="Performance_Improvements">Performance Improvements</h1> - <ul> - <li>Auto share multiple projects in single job</li> - <li>Fix inefficient implementation of GitScopeOperation</li> - <li>Improve performance of hyperlink detection in History View</li> - </ul><hr/> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <td style="width: 20%" align="left"> - <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="3.1.html" title="EGit 3.1 New and Noteworthy"> - <img alt="EGit 3.1 New and Noteworthy" border="0" src="../../../images/home.gif"/> - </a> - </td> - <td style="width: 20%" align="right"> - <a href="Build-and-Release-Engineering.html" title="Build and Release Engineering"> - <img alt="Next" border="0" src="../../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <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">Build and Release Engineering</td> - </tr> - </table> - </body> -</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/images/Checkout-remotetracking-egit-3.1.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/images/Checkout-remotetracking-egit-3.1.png Binary files differdeleted file mode 100644 index 1a0175436e..0000000000 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/images/Checkout-remotetracking-egit-3.1.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/images/Delete-repository-egit-3.1.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/images/Delete-repository-egit-3.1.png Binary files differdeleted file mode 100644 index 370b20297c..0000000000 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/images/Delete-repository-egit-3.1.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/images/Gerrit-repoview-egit-3.1.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/images/Gerrit-repoview-egit-3.1.png Binary files differdeleted file mode 100644 index 371aae220d..0000000000 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/images/Gerrit-repoview-egit-3.1.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/images/Hyperlink-staging-egit-3.1.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/images/Hyperlink-staging-egit-3.1.png Binary files differdeleted file mode 100644 index ad277fb2ec..0000000000 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/images/Hyperlink-staging-egit-3.1.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/images/Merge-options-egit-3.1.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/images/Merge-options-egit-3.1.png Binary files differdeleted file mode 100644 index 4cb0b45659..0000000000 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/images/Merge-options-egit-3.1.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/images/Staging-filter-egit-3.1.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/images/Staging-filter-egit-3.1.png Binary files differdeleted file mode 100644 index 28f712d2fe..0000000000 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/images/Staging-filter-egit-3.1.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/images/Staging-presentation-options-egit-3.1.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/images/Staging-presentation-options-egit-3.1.png Binary files differdeleted file mode 100644 index bafd740bf2..0000000000 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/images/Staging-presentation-options-egit-3.1.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/images/Staging-rebase-egit-3.1.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/images/Staging-rebase-egit-3.1.png Binary files differdeleted file mode 100644 index c1e9bfe937..0000000000 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/images/Staging-rebase-egit-3.1.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/3.2.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/3.2.html new file mode 100644 index 0000000000..2efbd9134a --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/3.2.html @@ -0,0 +1,116 @@ +<?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.2 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.2 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">EGit</h1> + <h2 id="Features">Features</h2> + <ul> + <li>Interactive rebase allows to quickly edit a series of commits</li> + </ul> + <p> + <img border="0" src="images/Egit-3.2-InteractiveRebaseView.png"/> + </p> + <ul> + <li>Support for configuration option rebase.autostash. Automatically create a temporary stash before a rebase operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts.</li> + </ul> + <ul> + <li>Add dropping multiple stashed commits in repositories view, select multiple stashes and click "Delete Stashed Commits..."</li> + </ul> + <ul> + <li>Push Branch / Initial Push wizard simplifies pushing a branch and also allows upstream configuration for new branches created by the push operation</li> + </ul> + <p> + <img border="0" src="images/Egit-3.2-PushBranchWizard.png"/> + </p> + <ul> + <li>Push Tags wizard simplifies pushing one or multiple tags</li> + </ul> + <p> + <img border="0" src="images/Egit-3.2-PushTagWizard.png"/> + </p> + <ul> + <li>Improve UI of upstream configuration when creating a branch</li> + </ul> + <p> + <img border="0" src="images/Egit-3.2-CreateBranchWizard.png"/> + </p> + <ul> + <li>Blame annotations: Add link for showing commit in history and open</li> + <li>Blame annotations: Show start commit when opening editor</li> + <li>Blame annotations: Show diff in hover and enable blaming parent commits</li> + </ul> + <p> + <img border="0" src="images/Egit-3.2-BlameImprovements.png"/> + </p> + <ul> + <li>PSF import also supports checking out tags, not only branches</li> + <li>Make Merge Tool work for non-workspace files</li> + <li>Rebase: Show dialog in case there are uncommitted changes</li> + <li>"Search all" option for find toolbar in history view</li> + </ul> + <h2 id="Usability_Improvements">Usability Improvements</h2> + <ul> + <li>Push Branch wizard: Preselect remote if branch has one configured</li> + <li>BranchSelectionDialog: Make resizable and sort elements</li> + <li>Add Show In > History to file diff pane in history view</li> + <li>Improve rendering of file diffs in history view</li> + <li>Commit dialog: Add "Compare with HEAD revision" to file context menu</li> + <li>Automatically share projects when adding existing repository in repositories view</li> + <li>Show tooltips for refs (history view, branch selection dialogs)</li> + <li>Prohibit invalid remote name in clone wizard</li> + <li>Disable Delete button when current branch is selected in Checkout dialog</li> + <li>Allow to edit branches while fetching from Gerrit</li> + <li>Show checkout confirmation when triggered from repositories view</li> + <li>Prohibit empty remote name</li> + <li>Only show "New HEAD" in merge result dialog when applicable</li> + <li>Fix showing deleted file in history from commit viewer</li> + <li>Expand the "Working Directory" node in import wizard</li> + <li>Validate branch and tag names in FetchFromGerritWizard</li> + <li>Add dialog settings to project import dialog</li> + <li>Validate new remote's name in NewRemoteDialog</li> + </ul> + <h2 id="Performance_Improvements">Performance Improvements</h2> + <ul> + <li>Improve performance of loading tags in repositories view</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/EGit/New_and_Noteworthy/3.1/Bug-Fixes.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/Bug-Fixes.html index cf7789fc50..500fd55c13 100644 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/Bug-Fixes.html +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/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 3.1 New and Noteworthy - Bug Fixes</title> + <title>EGit 3.2 New and Noteworthy - Bug Fixes</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> @@ -31,7 +31,7 @@ </table><hr/> <h1 id="Bug_Fixes">Bug Fixes</h1> <p> - <a href="https://bugs.eclipse.org/bugs/buglist.cgi?list_id=3805932&resolution=FIXED&resolution=DUPLICATE&classification=Technology&chfieldto=2013-10-02&chfield=resolution&query_format=advanced&chfieldfrom=2013-06-27&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&product=EGit" target="egit_external">91 Bugs and 34 enhancement requests</a> were closed + <a href="https://bugs.eclipse.org/bugs/buglist.cgi?list_id=3805932&resolution=FIXED&resolution=DUPLICATE&classification=Technology&chfieldto=2013-12-18&chfield=resolution&query_format=advanced&chfieldfrom=2013-10-03&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&product=EGit" target="egit_external">55 Bugs and 13 enhancement requests</a> were closed </p><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> @@ -41,8 +41,8 @@ </a> </td> <td style="width: 60%" align="center"> - <a href="3.1.html" title="EGit 3.1 New and Noteworthy"> - <img alt="EGit 3.1 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="3.2.html" title="EGit 3.2 New and Noteworthy"> + <img alt="EGit 3.2 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.1/Build-and-Release-Engineering.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/Build-and-Release-Engineering.html index 8906eb8b58..f8d3858144 100644 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.1/Build-and-Release-Engineering.html +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/Build-and-Release-Engineering.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 3.1 New and Noteworthy - Build and Release Engineering</title> + <title>EGit 3.2 New and Noteworthy - Build and Release Engineering</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="GitHub-Connector-Features.html" title="GitHub Connector Features"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> @@ -24,28 +24,27 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">Performance Improvements</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="Build_and_Release_Engineering">Build and Release Engineering</h1> <ul> - <li>Update build to use Tycho 0.18</li> - <li>Update to Jetty 7.6.11.v20130520</li> - <li>Update to Orbit Kepler SR1 release R20130827064939</li> - <li>Update build to use CBI jarsigner plugin</li> + <li>Update Jetty to 7.6.14.v20131031</li> + <li>Add Luna target platform and update dependencies for Luna</li> + <li>Update build to use Tycho 0.19</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="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="3.1.html" title="JGit 3.1 New and Noteworthy"> - <img alt="JGit 3.1 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="3.2.html" title="EGit 3.2 New and Noteworthy"> + <img alt="EGit 3.2 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"> @@ -55,7 +54,7 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">Performance Improvements</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/JGit/New_and_Noteworthy/3.1/Contributors.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/Contributors.html index 8d76f8e7f0..7f39c1468c 100644 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.1/Contributors.html +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/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 3.1 New and Noteworthy - Contributors</title> + <title>EGit 3.2 New and Noteworthy - Contributors</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> @@ -30,8 +30,8 @@ </tr> </table><hr/> <h1 id="Contributors">Contributors</h1> - <p>The following 5 developers worked on this release of JGit:</p> - <p>Matthias Sohn, Robin Rosenberg, Robin Stocker, Shawn Pearce, Tomasz Zarna</p><hr/> + <p>The following 14 developers worked on this release:</p> + <p>Ben Hammen, Boris Brodski, Christian Georgi, Christian Halstrick, Johan Wannheden, Kaloyan Raev, Markus Keller, Matthias Sohn, Michael Keppler, Mykola Nikishov, Robin Stocker, Stefan Lay, Tobias Pfeifer, Tomasz Zarna</p><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"> @@ -40,8 +40,8 @@ </a> </td> <td style="width: 60%" align="center"> - <a href="3.1.html" title="JGit 3.1 New and Noteworthy"> - <img alt="JGit 3.1 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="3.2.html" title="EGit 3.2 New and Noteworthy"> + <img alt="EGit 3.2 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.1/Performance-Improvements.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/GitHub-Connector-Features.html index 150621879f..9f56ed82f9 100644 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.1/Performance-Improvements.html +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/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>JGit 3.1 New and Noteworthy - Performance Improvements</title> + <title>EGit 3.2 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">Performance Improvements</th> + <th style="width: 100%" align="center" colspan="3">GitHub Connector Features</th> </tr> <tr> <td style="width: 20%" align="left"> - <a href="3.1.html" title="JGit 3.1 New and Noteworthy"> + <a href="3.2.html" title="EGit 3.2 New and Noteworthy"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> @@ -24,25 +24,23 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">JGit 3.1 New and Noteworthy</td> + <td style="width: 20%" align="left" valign="top">EGit 3.2 New and Noteworthy</td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top">Build and Release Engineering</td> </tr> </table><hr/> - <h1 id="Performance_Improvements">Performance Improvements</h1> - <ul> - <li>Use a bucket sort for PackReverseIndex speeding up creatiion of reverse pack index by a factor of 3</li> - </ul><hr/> + <h1 id="GitHub_Connector_Features">GitHub Connector Features</h1> + <p>No new features in this release.</p><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"> - <a href="3.1.html" title="JGit 3.1 New and Noteworthy"> + <a href="3.2.html" title="EGit 3.2 New and Noteworthy"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> <td style="width: 60%" align="center"> - <a href="3.1.html" title="JGit 3.1 New and Noteworthy"> - <img alt="JGit 3.1 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="3.2.html" title="EGit 3.2 New and Noteworthy"> + <img alt="EGit 3.2 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"> @@ -52,7 +50,7 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">JGit 3.1 New and Noteworthy</td> + <td style="width: 20%" align="left" valign="top">EGit 3.2 New and Noteworthy</td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top">Build and Release Engineering</td> </tr> diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/Updating-This-Document.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/Updating-This-Document.html index 68d1440782..5a332111ed 100644 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/Updating-This-Document.html +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/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 3.1 New and Noteworthy - Updating This Document</title> + <title>EGit 3.2 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/3.1" target="egit_external">http://wiki.eclipse.org/EGit/New_and_Noteworthy/3.1</a> + <a href="http://wiki.eclipse.org/EGit/New_and_Noteworthy/3.2" target="egit_external">http://wiki.eclipse.org/EGit/New_and_Noteworthy/3.2</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="3.1.html" title="EGit 3.1 New and Noteworthy"> - <img alt="EGit 3.1 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="3.2.html" title="EGit 3.2 New and Noteworthy"> + <img alt="EGit 3.2 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.2/images/Egit-3.2-BlameImprovements.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/images/Egit-3.2-BlameImprovements.png Binary files differnew file mode 100644 index 0000000000..ce17c7992f --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/images/Egit-3.2-BlameImprovements.png diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/images/Egit-3.2-CreateBranchWizard.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/images/Egit-3.2-CreateBranchWizard.png Binary files differnew file mode 100644 index 0000000000..3c6a327c18 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/images/Egit-3.2-CreateBranchWizard.png diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/images/Egit-3.2-InteractiveRebaseView.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/images/Egit-3.2-InteractiveRebaseView.png Binary files differnew file mode 100644 index 0000000000..0d9c811995 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/images/Egit-3.2-InteractiveRebaseView.png diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/images/Egit-3.2-PushBranchWizard.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/images/Egit-3.2-PushBranchWizard.png Binary files differnew file mode 100644 index 0000000000..cacb87f4da --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/images/Egit-3.2-PushBranchWizard.png diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/images/Egit-3.2-PushTagWizard.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/images/Egit-3.2-PushTagWizard.png Binary files differnew file mode 100644 index 0000000000..12f05832a3 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/images/Egit-3.2-PushTagWizard.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 dbed4b65ef..0eedd3dffd 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Reference.html +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/Reference.html @@ -891,9 +891,6 @@ <b>Ignore</b> <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. - </p> <h2 id="Git_Fetch_Factory_for_PDE_Build">Git Fetch Factory for PDE Build</h2> <p>As part of EGit's PDE Tools, there's a PDE Build fetch factory for Git included in the <b>org.eclipse.egit.fetchfactory</b> plug-in. 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 36aa08673f..1a38d08437 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html @@ -392,7 +392,7 @@ <ul> <li>enter source and destination ref or select already existing branches from the drop-down lists</li> <li>click - <b>Add spec</b> + <b>Add Spec</b> </li> </ul> <p>This will transfer the newly defined mapping to the list @@ -410,7 +410,7 @@ <h5 id="Delete_Ref_Specifications">Delete Ref Specifications</h5> <p>To delete a ref in the destination repository select the ref to be deleted from the drop-down list <b>Remote ref to delete</b> and click - <b>Add spec</b>. This will create a corresponding entry in the + <b>Add Spec</b>. This will create a corresponding entry in the <b>Specifications for push</b> list. Alternatively you may type in the specification for the refs to be deleted, this may also use wildcards. Pushing Delete Ref Specifications will delete the matching Refs in the destination repository. </p> <p> @@ -587,7 +587,7 @@ <ul> <li>enter source (ref in source repository) and destination ref (tracking branch or tag in local repository) or select already existing branches from the drop-down lists</li> <li>click - <b>Add spec</b> + <b>Add Spec</b> </li> </ul> <p>This will transfer the newly defined mapping to the list @@ -1648,6 +1648,128 @@ Sein oder nicht sein </p> <h3 id="Aborting_Rebase">Aborting Rebase</h3> <p>As long as the Repository is in "Rebasing" state, the user can always abort the rebase in the Git Repositories View using the menu action "Rebase > Abort" which is available on the Repository node.</p> + <h2 id="Interactive_Rebase">Interactive Rebase</h2> + <h3 id="Synopsis">Synopsis</h3> + <p> + <img border="0" src="images/Egit-3.2-InteractiveRebaseView.png"/> + </p> + <p>Interactive rebase allows to quickly edit a series of commits using the following actions defined in a rebase plan:</p> + <ul> + <li> + <b>pick</b> to define the order of commits, moving pick entries enables reordering + </li> + <li> + <b>skip</b> to remove a commit + </li> + <li> + <b>edit</b> to amend a commit + </li> + <li> + <b>reword</b> to edit a commit's message + </li> + <li> + <b>squash</b> to squash a commit with its predecessor commit and including their commit messages + </li> + <li> + <b>fixup</b> to squash a commit's diff into its predecessor discarding the squashed commit's message + </li> + </ul> + <p> + <b>Warning:</b> don't rewrite commits you have already published on a remote repository, it's considered a bad practice for all but experimental or review branches since your colleagues may have already based their work on these published commits and you would force them to also rewrite their changes. Though it's a tool frequently used on review branches e.g. when using Gerrit to rework changes which have to be improved based on review feedback. + </p> + <h3 id="Starting_interactive_rebase">Starting interactive rebase</h3> + <p>First checkout the local branch (here branch + <i>toRebase</i>) containing the commit series you want to edit. Then open the History View for this repository and click + <b>Interactive Rebase</b> on the commit preceding the oldest commit you want to rewrite. Often this is the one origin/master points at. + </p> + <p> + <img border="0" src="images/Egit-3.2-StartInteractiveRebase.png"/> + </p> + <p>This opens the new view + <b>Git Interactive Rebase</b> showing the rebase plan populated with the commits to be modified in topological order in the sequence they will be processed during the rebase operation. + The initial action for all commits is + <b>Pick</b> which would cherry-pick the corresponding commit. Note that EGit also rewinds HEAD to the commit preceding the first one in the edit list in order to prepare the repository for rebasing. + </p> + <p> + <img border="0" src="images/Egit-3.2-StartedInteractiveRebase.png"/> + </p> + <h3 id="Planning_rebase">Planning rebase</h3> + <p>Here the initial rebase plan, the first commit to be applied on the rewound HEAD comes first and then all the other commits to be rebased in the order they will be applied when clicking "Start".</p> + <p> + <img border="0" src="images/Egit-3.2-PlanInteractiveRebase.png"/> + </p> + <p>Next we prepare the rebase plan, moving commits up and down using the arrow buttons to reorder commits and choosing the rebase action we want to apply on the commits we want to tweak.</p> + <p>In this example I first reordered the commits so that the implementation of new calculator operations immediately precedes the commit implementing tests for the respective operation.</p> + <p> + <b>Here what I want to modify in this series of commits:</b> + </p> + <p>I want to skip commit "TODO list" since it contains a private todo list I used while implementing the operations and I don't need this anymore. + I need to amend commit "Add divide operation" since it's buggy, this was revealed by the corresponding test which was implemented in a later change, hence I select action + <b>Edit</b> here + the commit "Add multiply opration" obviously has a typo in the commit message header so I choose + <b>Reword</b>. + I want to squash commit de7647b into its predecessor since it doesn't make sense to have the JavaDoc fix separate from the implementation of what it describes, hence I choose + <b>Squash</b> to squash it with its predecessor. + </p> + <p> + <img border="0" src="images/Egit-3.2-InteractiveRebaseView.png"/> + </p> + <h3 id="Executing_interactive_rebase">Executing interactive rebase</h3> + <p>When you're done planning the rebase click + <b>Start</b> to start execution of the rebase command. EGit will process the plan and stop at the commits where you have selected actions which need your intervention to interactively edit the corresponding commit. + </p> + <p>In our little example rebase stops the first time on commit "Add divide operation" since we signaled that we want to edit it. The last picked commit is highlighted in bold. At this time the first step skipping the commit "TODO list" was already processed and this commit is no longer in our commit series we are rewriting while executing rebase. Also the commit "Add divide operation" was already cherry-picked since we want to amend it. Note that EGit has already selected the "Amend" option in the Staging View in order to prepare amending this commit.</p> + <p> + <img border="0" src="images/Egit-3.2-InteractiveRebaseEdit.png"/> + </p> + <p>Now we fix the bug in this commit, stage the changes needed to fix the bug, adjust the commit message if necessary and click + <b>Commit</b> in order to amend the buggy commit. + </p> + <p> + <img border="0" src="images/Egit-3.2-InteractiveRebaseAmend.png"/> + </p> + <p>Let's have a look at the History View to see the resulting commit graph. HEAD now points at the rewritten fixed commit "Add divide operation", note that its SHA1 is different from its original version since we rewrote the commit to fix the bug.</p> + <p> + <img border="0" src="images/Egit-3.2-InteractiveRebaseHistoryAfterEdit.png"/> + </p> + <p>Next we click + <b>Continue</b> in order to resume processing the rebase plan. Rebase picks the commits "Divide test" and "Add multiply opration" and stops again raising a commit message editor so that we can fix the typo in the commit message of the latter commit. + </p> + <p> + <img border="0" src="images/Egit-3.2-InteractiveRebaseReword.png"/> + </p> + <p>Edit the commit message to fix the typo and click + <b>OK</b> in order to amend the commit message and resume processing. + </p> + <p>Rebase picks the next 3 commits, squashes the commits "add power" and "Fix javadoc for power operation" into one new commit and stops again so that we can prepare the commit message of the new commit. Its initialized with the concatenation of the messages of the commits being squashed.</p> + <p> + <img border="0" src="images/Egit-3.2-InteractiveRebaseSquash.png"/> + </p> + <p>Edit the squashed commit's message and click + <b>OK</b> to resume processing. + </p> + <p> + <img border="0" src="images/Egit-3.2-InteractiveRebaseSquashMessage.png"/> + </p> + <p>Rebase picks the final commit "Power test" and completes successfully.</p> + <p> + <img border="0" src="images/Egit-3.2-InteractiveRebaseFinished.png"/> + </p> + <p>Finally lets have another look in the History View to examine the result of the interactive rebase command. Compare the rewritten series of commits now contained in branch "toRebase" with the old commit series still visible since I have placed another local branch "start" there in order to keep the old series visible.</p> + <p> + <img border="0" src="images/Egit-3.2-InteractiveRebaseHistoryAfterRebase.png"/> + </p> + <h3 id="Safety_Instructions">Safety Instructions</h3> + <p>If you happen to go wrong during this multi-step process you can always hit + <b>Abort</b> in order to stop the rebase operation in progress and roll back to the starting point. + </p> + <p>When you are starting to use this feature it's maybe a good idea to place a second local branch on the starting point (as I showed in this example) to make it more obvious what's going on until you are familiar with this powerful git command.</p> + <h3 id="Rebase_with_auto-stashing">Rebase with auto-stashing</h3> + <p>EGit also supports the Git configuration option + <b>rebase.autostash</b>. Set this option + <b>rebase.autostash = true</b> to automatically create a temporary stash before a rebase operation begins, and apply it after the operation ends. This means that you can run rebase and also interactive rebase on a dirty worktree. However, + <b>use with care:</b> the final stash application after a successful rebase might result in non-trivial conflicts. + </p> <h2 id="Cherry_Picking">Cherry Picking</h2> <h3 id="Cherry-pick_Introduction">Cherry-pick Introduction</h3> <p>A given commit @@ -2352,16 +2474,19 @@ Sein oder nicht sein </p> <p>Selecting the <b>Team</b> > - <b>Show Annotations</b> action on file selections will open the editor and display an annotation ruler with commit and author information for each line in a file. Hovering over the ruler will display a pop-up showing the commit id, author, committer, and the commit message. + <b>Show Annotations</b> action on file selections will open the editor and display an annotation ruler with commit and author information for each line in a file. Hovering over the ruler will display a pop-up showing the commit id, author, committer, commit message and the diff applied by this commit on the selected hunk. </p> <p>The look and feel of the blame annotation editor ruler can be configured from the <b>Revisions</b> sub-menu available from the ruler context-menu. </p> <p> - <img border="0" src="images/Egit-1.0-blame-ruler.png"/> + <img border="0" src="images/Egit-3.2-BlameImprovements.png"/> </p> - <p>Selecting the SHA-1 hyperlink from the popup will open the commit in the - <a href="#Viewing_Commits">commit viewer</a>. + <p>Click + <b>open commit</b> to open the commit in the + <a href="#Viewing_Commits">commit viewer</a>, click + <b>show in history</b> to show the commit in the History View. Click + <b>show annotations</b> to show annotations of the parent commit of the commit shown in the hover. </p> <h2 id="Working_with_Submodules">Working with Submodules</h2> <p>You can read more about what Git submodules are and how they work in this 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 3084f25cc8..5f37df9a8e 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 @@ -75,6 +75,9 @@ <br/> </li> </ol> + <p>Note that if you use + <a href="http://www.cygwin.com/" target="egit_external">Cygwin</a>, you should already have <code>HOME</code> set. For example, if you installed Cygwin to <code>C:\cygwin</code> and your username is Fred, then Cygwin should have already set <code>HOME</code> to <code>C:\cygwin\home\Fred</code> (or something similar). You can verify this by entering <code>echo %HOME%</code> in the Windows command prompt, or <code>echo $HOME</code> in the Cygwin shell. + </p> <p>EGit needs this path for looking up the user configuration (.gitconfig). <code>HOME</code> should point to your home directory e.g. <code>C:\Users\Tom</code>. <b>Ensure correct case!</b> E.g. <code>C:\users</code> instead of <code>C:\Users</code> may cause problems! </p> @@ -172,9 +175,6 @@ <b>Filters...</b> from the View Menu and you will be presented with the Java Element Filters dialog. Unselect the top entry to display files that begin with . (period) such as <code>.gitignore</code>. </li> </ul> - <p> - <img border="0" src="images/Filters.png"/> - </p> <ul> <li>Click <b>Team > Commit</b> in the project context menu diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/01-TextDecorations.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/01-TextDecorations.png Binary files differindex 262fdd991c..5896590d2f 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/01-TextDecorations.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/01-TextDecorations.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/02-IconDecorations.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/02-IconDecorations.png Binary files differindex 5f331621e5..c15feb4b1d 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/02-IconDecorations.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/02-IconDecorations.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/03-ExampleDecoration.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/03-ExampleDecoration.png Binary files differindex 591a7bb87e..eabc67928d 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/03-ExampleDecoration.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/03-ExampleDecoration.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/04-QuickDiffPreferences.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/04-QuickDiffPreferences.png Binary files differindex 96176ee2dc..524ac40dd1 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/04-QuickDiffPreferences.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/04-QuickDiffPreferences.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/05-QuickDiffInEditor.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/05-QuickDiffInEditor.png Binary files differindex 745a11da5d..55ef3026d1 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/05-QuickDiffInEditor.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/05-QuickDiffInEditor.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/06-QuickDiffInEditorPopup.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/06-QuickDiffInEditorPopup.png Binary files differindex c71ab5d360..e1b4baa011 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/06-QuickDiffInEditorPopup.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/06-QuickDiffInEditorPopup.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/CherryPick1.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/CherryPick1.png Binary files differindex ce1d6e0766..d567bcfb9f 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/CherryPick1.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/CherryPick1.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/CherryPick2.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/CherryPick2.png Binary files differindex 0f8ab37277..83e332f4f2 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/CherryPick2.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/CherryPick2.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/CherryPick3.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/CherryPick3.png Binary files differindex ea181c8330..efb46ff725 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/CherryPick3.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/CherryPick3.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Commit-editor-commit-page.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Commit-editor-commit-page.png Binary files differindex dfd6e22a68..f8efabb5c5 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Commit-editor-commit-page.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Commit-editor-commit-page.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-BlameImprovements.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-BlameImprovements.png Binary files differnew file mode 100644 index 0000000000..96634fb6c6 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-BlameImprovements.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseAmend.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseAmend.png Binary files differnew file mode 100644 index 0000000000..9bfbcd64d5 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseAmend.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseEdit.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseEdit.png Binary files differnew file mode 100644 index 0000000000..043a92b2c1 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseEdit.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseFinished.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseFinished.png Binary files differnew file mode 100644 index 0000000000..ef1cf9e7da --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseFinished.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseHistoryAfterEdit.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseHistoryAfterEdit.png Binary files differnew file mode 100644 index 0000000000..1e0d72ffb2 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseHistoryAfterEdit.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseHistoryAfterRebase.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseHistoryAfterRebase.png Binary files differnew file mode 100644 index 0000000000..df0f4e4e98 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseHistoryAfterRebase.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseReword.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseReword.png Binary files differnew file mode 100644 index 0000000000..7e62651020 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseReword.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseSquash.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseSquash.png Binary files differnew file mode 100644 index 0000000000..2d49757cbe --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseSquash.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseSquashMessage.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseSquashMessage.png Binary files differnew file mode 100644 index 0000000000..3cfa92dc1c --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseSquashMessage.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseView.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseView.png Binary files differnew file mode 100644 index 0000000000..8bcce2a790 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseView.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-PlanInteractiveRebase.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-PlanInteractiveRebase.png Binary files differnew file mode 100644 index 0000000000..b894b9a1db --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-PlanInteractiveRebase.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-StartInteractiveRebase.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-StartInteractiveRebase.png Binary files differnew file mode 100644 index 0000000000..2156686c66 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-StartInteractiveRebase.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-StartedInteractiveRebase.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-StartedInteractiveRebase.png Binary files differnew file mode 100644 index 0000000000..fbbae7434d --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-StartedInteractiveRebase.png diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.1/3.1.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.2/3.2.html index 2f9b5418cc..9cd9f8b8d1 100644 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.1/3.1.html +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.2/3.2.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 3.1 New and Noteworthy</title> + <title>JGit 3.2 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 3.1 New and Noteworthy</th> + <th style="width: 100%" align="center" colspan="3">JGit 3.2 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="Bug-Fixes.html" title="Bug Fixes"> <img alt="Next" border="0" src="../../../images/next.gif"/> </a> </td> @@ -22,34 +22,40 @@ <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">Bug Fixes</td> </tr> </table><hr/> <h1 id="Features">Features</h1> - <h2 id="Commands">Commands</h2> <ul> - <li>Move ArchiveCommand into standard porcelain API</li> - <li>Add path option to StatusCommand</li> - <li>ResetCommand: Allow reset on unborn branch when ref not specified</li> - <li>Enable LsRemoteCommand to work without local repository</li> + <li>Interactive rebase</li> + <li>Support for rebase.autostash</li> + <li>Add recursive variant of Config.getNames() methods</li> </ul> - <h2 id="Library">Library</h2> + <h2 id="Commands">Commands</h2> <ul> - <li>Add tgz, txz and tbz2 archive formats</li> - <li>Add long filename, large file, and non-ASCII filename support to TarFormat</li> - <li>Make sure checkout is not deleting folders outside the working tree</li> - <li>Implement TransportLocal.open(URIish), this can be used for listing remote refs for a repository on the file system without having a local repository</li> + <li>Added the git-describe implementation</li> </ul> <h2 id="Command_Line">Command Line</h2> <ul> - <li>Make gc a public command</li> + <li>status command supports --porcelain</li> + <li>fetch command supports --tags</li> + <li>added describe command</li> + <li>list all supported formats in archive command's help</li> + <li>add support for --version</li> + </ul> + <h2 id="Build_and_Release_Engineering">Build and Release Engineering</h2> + <ul> + <li>Updated Jetty to 7.6.14.v20131031</li> + <li>Updated to Ant 1.9.2</li> + <li>Introduced Kepler and Luna target platform</li> + <li>Updated build to use Tycho 0.19</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="Performance-Improvements.html" title="Performance Improvements"> + <a href="Bug-Fixes.html" title="Bug Fixes"> <img alt="Next" border="0" src="../../../images/next.gif"/> </a> </td> @@ -57,7 +63,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">Bug Fixes</td> </tr> </table> </body> diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.1/Bug-Fixes.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.2/Bug-Fixes.html index d698ce5d7c..8b70aa8fb4 100644 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.1/Bug-Fixes.html +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.2/Bug-Fixes.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>JGit 3.1 New and Noteworthy - Bug Fixes</title> + <title>JGit 3.2 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="Build-and-Release-Engineering.html" title="Build and Release Engineering"> + <a href="3.2.html" title="JGit 3.2 New and Noteworthy"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> @@ -24,25 +24,25 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">Build and Release Engineering</td> + <td style="width: 20%" align="left" valign="top">JGit 3.2 New and Noteworthy</td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top">Contributors</td> </tr> </table><hr/> <h1 id="Bug_Fixes">Bug Fixes</h1> <p> - <a href="https://bugs.eclipse.org/bugs/buglist.cgi?resolution=FIXED&resolution=DUPLICATE&classification=Technology&chfieldto=2013-10-02&query_format=advanced&chfield=bug_status&chfieldfrom=2013-06-27&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&product=JGit&target_milestone=3.1" target="egit_external">5 Bugs and 2 enhancement requests</a> were closed + <a href="https://bugs.eclipse.org/bugs/buglist.cgi?resolution=FIXED&resolution=DUPLICATE&classification=Technology&chfieldto=2013-12-18&query_format=advanced&chfield=bug_status&chfieldfrom=2013-10-03&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&product=JGit&target_milestone=3.2" target="egit_external">13 Bugs and 6 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="Build-and-Release-Engineering.html" title="Build and Release Engineering"> + <a href="3.2.html" title="JGit 3.2 New and Noteworthy"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> <td style="width: 60%" align="center"> - <a href="3.1.html" title="JGit 3.1 New and Noteworthy"> - <img alt="JGit 3.1 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="3.2.html" title="JGit 3.2 New and Noteworthy"> + <img alt="JGit 3.2 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"> @@ -52,7 +52,7 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">Build and Release Engineering</td> + <td style="width: 20%" align="left" valign="top">JGit 3.2 New and Noteworthy</td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top">Contributors</td> </tr> diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/Contributors.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.2/Contributors.html index 1776c80c5c..2a9a27513d 100644 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/Contributors.html +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.2/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 3.1 New and Noteworthy - Contributors</title> + <title>JGit 3.2 New and Noteworthy - Contributors</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> @@ -30,8 +30,8 @@ </tr> </table><hr/> <h1 id="Contributors">Contributors</h1> - <p>The following 10 developers worked on this release:</p> - <p>Andrew Gvozdev, Christian Georgi, Laurent Goubet, Marc-Andre Laperle, Matthias Sohn, Mikaël Barbero, Robin Rosenberg, Robin Stocker, Stephen Elsemore, Tomasz Zarna</p><hr/> + <p>The following 17 developers worked on this release of JGit:</p> + <p>Axel Richard, Christian Halstrick, Colby Ranger, Dave Borowitz, John Ross, Jonathan Nieder, Kaloyan Raev, Kohsuke Kawaguchi, Matthias Sohn, Michael Nelson, Robin Rosenberg, Robin Stocker, Rüdiger Herrmann, Shawn Pearce, Stefan Lay, Tobias Pfeifer, Tomasz Zarna</p><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"> @@ -40,8 +40,8 @@ </a> </td> <td style="width: 60%" align="center"> - <a href="3.1.html" title="EGit 3.1 New and Noteworthy"> - <img alt="EGit 3.1 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="3.2.html" title="JGit 3.2 New and Noteworthy"> + <img alt="JGit 3.2 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.1/Updating-This-Document.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.2/Updating-This-Document.html index 38337d8f1d..19f386607a 100644 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.1/Updating-This-Document.html +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.2/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 3.1 New and Noteworthy - Updating This Document</title> + <title>JGit 3.2 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/3.1" target="egit_external">http://wiki.eclipse.org/JGit/New_and_Noteworthy/3.1</a> + <a href="http://wiki.eclipse.org/JGit/New_and_Noteworthy/3.2" target="egit_external">http://wiki.eclipse.org/JGit/New_and_Noteworthy/3.2</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="3.1.html" title="JGit 3.1 New and Noteworthy"> - <img alt="JGit 3.1 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="3.2.html" title="JGit 3.2 New and Noteworthy"> + <img alt="JGit 3.2 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 20ca042b50..3f7a0334b4 100644 --- a/org.eclipse.egit.doc/help/toc.xml +++ b/org.eclipse.egit.doc/help/toc.xml @@ -200,6 +200,14 @@ <topic href="help/EGit/User_Guide/Tasks.html#Rebase_Conflicts" label="Rebase Conflicts"></topic> <topic href="help/EGit/User_Guide/Tasks.html#Aborting_Rebase" label="Aborting Rebase"></topic> </topic> + <topic href="help/EGit/User_Guide/Tasks.html#Interactive_Rebase" label="Interactive Rebase"> + <topic href="help/EGit/User_Guide/Tasks.html#Synopsis" label="Synopsis"></topic> + <topic href="help/EGit/User_Guide/Tasks.html#Starting_interactive_rebase" label="Starting interactive rebase"></topic> + <topic href="help/EGit/User_Guide/Tasks.html#Planning_rebase" label="Planning rebase"></topic> + <topic href="help/EGit/User_Guide/Tasks.html#Executing_interactive_rebase" label="Executing interactive rebase"></topic> + <topic href="help/EGit/User_Guide/Tasks.html#Safety_Instructions" label="Safety Instructions"></topic> + <topic href="help/EGit/User_Guide/Tasks.html#Rebase_with_auto-stashing" label="Rebase with auto-stashing"></topic> + </topic> <topic href="help/EGit/User_Guide/Tasks.html#Cherry_Picking" label="Cherry Picking"> <topic href="help/EGit/User_Guide/Tasks.html#Cherry-pick_Introduction" label="Cherry-pick Introduction"></topic> <topic href="help/EGit/User_Guide/Tasks.html#Cherry-pick_Example" label="Cherry-pick Example"></topic> @@ -424,29 +432,27 @@ </topic> <topic href="help/JGit/User_Guide/Updating-This-Document.html" label="Updating This Document"></topic> </topic> - <topic href="help/EGit/New_and_Noteworthy/3.1/3.1.html" label="EGit 3.1 New and Noteworthy"> - <topic href="help/EGit/New_and_Noteworthy/3.1/3.1.html" label="EGit"> - <topic href="help/EGit/New_and_Noteworthy/3.1/3.1.html#Features" label="Features"></topic> - <topic href="help/EGit/New_and_Noteworthy/3.1/3.1.html#Staging_View" label="Staging View"></topic> + <topic href="help/EGit/New_and_Noteworthy/3.2/3.2.html" label="EGit 3.2 New and Noteworthy"> + <topic href="help/EGit/New_and_Noteworthy/3.2/3.2.html" label="EGit"> + <topic href="help/EGit/New_and_Noteworthy/3.2/3.2.html#Features" label="Features"></topic> + <topic href="help/EGit/New_and_Noteworthy/3.2/3.2.html#Usability_Improvements" label="Usability Improvements"></topic> + <topic href="help/EGit/New_and_Noteworthy/3.2/3.2.html#Performance_Improvements" label="Performance Improvements"></topic> </topic> - <topic href="help/EGit/New_and_Noteworthy/3.1/GitHub-Connector-Features.html" label="GitHub Connector Features"></topic> - <topic href="help/EGit/New_and_Noteworthy/3.1/Performance-Improvements.html" label="Performance Improvements"></topic> - <topic href="help/EGit/New_and_Noteworthy/3.1/Build-and-Release-Engineering.html" label="Build and Release Engineering"></topic> - <topic href="help/EGit/New_and_Noteworthy/3.1/Bug-Fixes.html" label="Bug Fixes"></topic> - <topic href="help/EGit/New_and_Noteworthy/3.1/Contributors.html" label="Contributors"></topic> - <topic href="help/EGit/New_and_Noteworthy/3.1/Updating-This-Document.html" label="Updating This Document"></topic> + <topic href="help/EGit/New_and_Noteworthy/3.2/GitHub-Connector-Features.html" label="GitHub Connector Features"></topic> + <topic href="help/EGit/New_and_Noteworthy/3.2/Build-and-Release-Engineering.html" label="Build and Release Engineering"></topic> + <topic href="help/EGit/New_and_Noteworthy/3.2/Bug-Fixes.html" label="Bug Fixes"></topic> + <topic href="help/EGit/New_and_Noteworthy/3.2/Contributors.html" label="Contributors"></topic> + <topic href="help/EGit/New_and_Noteworthy/3.2/Updating-This-Document.html" label="Updating This Document"></topic> </topic> - <topic href="help/JGit/New_and_Noteworthy/3.1/3.1.html" label="JGit 3.1 New and Noteworthy"> - <topic href="help/JGit/New_and_Noteworthy/3.1/3.1.html" label="Features"> - <topic href="help/JGit/New_and_Noteworthy/3.1/3.1.html#Commands" label="Commands"></topic> - <topic href="help/JGit/New_and_Noteworthy/3.1/3.1.html#Library" label="Library"></topic> - <topic href="help/JGit/New_and_Noteworthy/3.1/3.1.html#Command_Line" label="Command Line"></topic> + <topic href="help/JGit/New_and_Noteworthy/3.2/3.2.html" label="JGit 3.2 New and Noteworthy"> + <topic href="help/JGit/New_and_Noteworthy/3.2/3.2.html" label="Features"> + <topic href="help/JGit/New_and_Noteworthy/3.2/3.2.html#Commands" label="Commands"></topic> + <topic href="help/JGit/New_and_Noteworthy/3.2/3.2.html#Command_Line" label="Command Line"></topic> + <topic href="help/JGit/New_and_Noteworthy/3.2/3.2.html#Build_and_Release_Engineering" label="Build and Release Engineering"></topic> </topic> - <topic href="help/JGit/New_and_Noteworthy/3.1/Performance-Improvements.html" label="Performance Improvements"></topic> - <topic href="help/JGit/New_and_Noteworthy/3.1/Build-and-Release-Engineering.html" label="Build and Release Engineering"></topic> - <topic href="help/JGit/New_and_Noteworthy/3.1/Bug-Fixes.html" label="Bug Fixes"></topic> - <topic href="help/JGit/New_and_Noteworthy/3.1/Contributors.html" label="Contributors"></topic> - <topic href="help/JGit/New_and_Noteworthy/3.1/Updating-This-Document.html" label="Updating This Document"></topic> + <topic href="help/JGit/New_and_Noteworthy/3.2/Bug-Fixes.html" label="Bug Fixes"></topic> + <topic href="help/JGit/New_and_Noteworthy/3.2/Contributors.html" label="Contributors"></topic> + <topic href="help/JGit/New_and_Noteworthy/3.2/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> |
