Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2016-06-06 23:20:07 +0000
committerMatthias Sohn2016-06-06 23:20:07 +0000
commitae7e03661b7ad54450c469a90ec46989658f03ed (patch)
treef796d462fa699b312e59c5b53d378db6cfdbf6bb
parent34dc0bee4d5fa22e84d2b90cb145a760be2ec6de (diff)
downloadegit-ae7e03661b7ad54450c469a90ec46989658f03ed.tar.gz
egit-ae7e03661b7ad54450c469a90ec46989658f03ed.tar.xz
egit-ae7e03661b7ad54450c469a90ec46989658f03ed.zip
Update documentation for 4.4
Change-Id: Icbdd82db3e564a4e72c14b940b1d92d06a6fcd6f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.egit.doc/help/EGit/Contributor_Guide/Contributing-Patches.html4
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.3/4.3.html88
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.4/4.4.html77
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.4/Bug-Fixes.html (renamed from org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.3/Bug-Fixes.html)16
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.4/Contributors.html (renamed from org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.3/Contributors.html)16
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.4/Updating-This-Document.html (renamed from org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.3/Updating-This-Document.html)8
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html22
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-4.4-PushChangeToGerritDialog.pngbin0 -> 14143 bytes
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.3/4.3.html101
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.4/4.4.html60
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.4/Bug-Fixes.html (renamed from org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.3/Bug-Fixes.html)16
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.4/Contributors.html (renamed from org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.3/Contributors.html)30
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.4/Updating-This-Document.html (renamed from org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.3/Updating-This-Document.html)8
13 files changed, 198 insertions, 248 deletions
diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Contributing-Patches.html b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Contributing-Patches.html
index b85fa61cff..9157b8c2bd 100644
--- a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Contributing-Patches.html
+++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Contributing-Patches.html
@@ -32,7 +32,7 @@
<h1 id="Contributing_Patches">Contributing Patches</h1>
<h2 id="Using_Gerrit_at_Eclipse">Using Gerrit at Eclipse</h2>
<p>EGit and JGit projects are using
- <a href="http://code.google.com/p/gerrit/" target="egit_external">Gerrit Code Review</a> for Git based patch submission and review.
+ <a href="https://www.gerritcodereview.com/" target="egit_external">Gerrit Code Review</a> for Git based patch submission and review.
</p>
<p>Parts of this chapter are also available in the
<a href="http://wiki.eclipse.org/Gerrit#Doing_Code_Reviews_with_Gerrit" target="egit_external">Eclipse Gerrit wiki</a>.
@@ -315,7 +315,7 @@ git config remote.review.push HEAD:refs/for/master
<i>Gerrit</i> parse this meta data to provide additional functionality.
<ul>
<li>If there is an associated bug number in Bugzilla about it, it should come as a
- <i>Bug:</i> footer right before Gerrit's Change-Id entry (if available) or towards the end.
+ <i>Bug:</i> footer right before Gerrit's Change-Id entry (if available) or towards the end. Use exactly the capitalization "Bug", since the automatic linking mechanism to the bug database is case sensitive.
</li>
<li>If a
<i>Contribution Questionnaire</i> has been issued to initiate and track the review of contributed changes by the Eclipse Foundation's IP team the IPZilla bug number should be added as
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.3/4.3.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.3/4.3.html
deleted file mode 100644
index f8dcd8f8f8..0000000000
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.3/4.3.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>EGit 4.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 4.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="Bug-Fixes.html" title="Bug Fixes">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top"></td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Bug Fixes</td>
- </tr>
- </table><hr class="navigation-separator"/>
- <h1 id="EGit">EGit</h1>
- <h2 id="Improve_support_for_submodules_and_nested_repositories">Improve support for submodules and nested repositories</h2>
- <ul>
- <li>Update index diff of parent repository when submodule changes</li>
- <li>Extended support for nested repositories in project.</li>
- <li>Fix refresh after re-connecting a project with submodules inside</li>
- <li>Handle submodules in auto-sharing</li>
- <li>Delegate detection of git repositories to JGit</li>
- <li>RepositoryCache: do not prematurely remove submodules</li>
- <li>RepositoriesViewLabelProvider: mark dirty submodules</li>
- <li>Fix recognition of submodules in folders.</li>
- </ul>
- <h2 id="Staging_View">Staging View</h2>
- <ul>
- <li>When running "Commit" action open staging view instead of commit dialog</li>
- <li>Auto-switch between horizontal and vertical StagingView layout</li>
- </ul>
- <h2 id="GitFlow">GitFlow</h2>
- <ul>
- <li>Allow filtering of Gitflow feature branches in checkout and track dialog</li>
- <li>Added Gitflow convenience command for checking out develop branch</li>
- </ul>
- <h2 id="Gerrit_support">Gerrit support</h2>
- <ul>
- <li>Staging View: Treat "Commit and Push" as Gerrit push for the currently checked out branch when the repository has a gerrit configuration.</li>
- <li>Auto-fill "Fetch from Gerrit" wizard for more clipboard contents</li>
- </ul>
- <h2 id="Miscellaneous_enhancements">Miscellaneous enhancements</h2>
- <ul>
- <li>Wizard to configure pull operation</li>
- <li>Use default preferences for preferred MergeStrategy</li>
- <li>Support copy/move of workspace if Git repository is under workspace</li>
- <li>Distinguish unchanged/deleted files in logical models</li>
- <li>In order to allow headless reuse move EclipseSshSessionFactory, EclipseAuthenticator and EclipseProxySelector to org.eclipse.egit.core</li>
- </ul>
- <h2 id="EGit_Github_Client">EGit Github Client</h2>
- <ul>
- <li>Add the assigner attribute to IssueEvent</li>
- </ul>
- <h2 id="Build_and_release_engineering">Build and release engineering</h2>
- <ul>
- <li>Update to latest SWTBot to get more meaningful screenshots on test errors</li>
- </ul><hr class="navigation-separator"/>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <td style="width: 20%" align="left"></td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right">
- <a href="Bug-Fixes.html" title="Bug Fixes">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top"></td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Bug Fixes</td>
- </tr>
- </table>
- </body>
-</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.4/4.4.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.4/4.4.html
new file mode 100644
index 0000000000..42f7a76327
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.4/4.4.html
@@ -0,0 +1,77 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title>EGit 4.4 New and Noteworthy</title>
+ <link type="text/css" rel="stylesheet" href="../../../book.css"/>
+ </head>
+ <body>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <th style="width: 100%" align="center" colspan="3">EGit 4.4 New and Noteworthy</th>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left"></td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right">
+ <a href="Bug-Fixes.html" title="Bug Fixes">
+ <img alt="Next" border="0" src="../../../images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top"></td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Bug Fixes</td>
+ </tr>
+ </table><hr class="navigation-separator"/>
+ <h1 id="EGit">EGit</h1>
+ <h2 id="Features">Features</h2>
+ <ul>
+ <li>Use SmartImport API from Platform UI to provide smart project import in EGit</li>
+ <li>"Push to Gerrit" wizard: add a way to define a topic when pushing to Gerrit</li>
+ <li>Add "Open in Commit Viewer" in context menu of stashed commit</li>
+ <li>Allow deletion of branch hierarchy nodes in Repositories View</li>
+ <li>Handle linked resources in the same repository if link target is not in a project</li>
+ <li>Add accelerators for "Compare With" and "Replace With" commands</li>
+ <li>Remove duplicate rename branch dialog</li>
+ </ul>
+ <h2 id="Gitflow">Gitflow</h2>
+ <ul>
+ <li>New convenience commands to compare/replace with Gitflow develop branch</li>
+ <li>Checkout feature dialog: mark current feature-branch and prevent attempted re-checkout</li>
+ <li>Added "commitId" and "last commit message" columns to Gitflow feature branch selection widget</li>
+ </ul>
+ <h2 id="Github">Github</h2>
+ <ul>
+ <li>Add missing attributes to CommitComment</li>
+ <li>Fix auto-filled issue task URL</li>
+ </ul>
+ <h2 id="Performance">Performance</h2>
+ <ul>
+ <li>Make sure we only allow one GitHistoryPageSource instance</li>
+ </ul>
+ <h2 id="Releng">Releng</h2>
+ <ul>
+ <li>Mark branding plugin and gitflow plugin as singletons</li>
+ <li>Include missing extension point schemas in EGit binaries</li>
+ <li>Update to findbugs 3.0.3 for Java 8 support</li>
+ </ul><hr class="navigation-separator"/>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <td style="width: 20%" align="left"></td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right">
+ <a href="Bug-Fixes.html" title="Bug Fixes">
+ <img alt="Next" border="0" src="../../../images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top"></td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Bug Fixes</td>
+ </tr>
+ </table>
+ </body>
+</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.3/Bug-Fixes.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.4/Bug-Fixes.html
index b35be866fa..fe0aff03f1 100644
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.3/Bug-Fixes.html
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.4/Bug-Fixes.html
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>EGit 4.3 New and Noteworthy - Bug Fixes</title>
+ <title>EGit 4.4 New and Noteworthy - Bug Fixes</title>
<link type="text/css" rel="stylesheet" href="../../../book.css"/>
</head>
<body>
@@ -12,7 +12,7 @@
</tr>
<tr>
<td style="width: 20%" align="left">
- <a href="4.3.html" title="EGit 4.3 New and Noteworthy">
+ <a href="4.4.html" title="EGit 4.4 New and Noteworthy">
<img alt="Previous" border="0" src="../../../images/prev.gif"/>
</a>
</td>
@@ -24,25 +24,25 @@
</td>
</tr>
<tr>
- <td style="width: 20%" align="left" valign="top">EGit 4.3 New and Noteworthy</td>
+ <td style="width: 20%" align="left" valign="top">EGit 4.4 New and Noteworthy</td>
<td style="width: 60%" align="center"></td>
<td style="width: 20%" align="right" valign="top">Contributors</td>
</tr>
</table><hr class="navigation-separator"/>
<h1 id="Bug_Fixes">Bug Fixes</h1>
<p>
- <a href="https://bugs.eclipse.org/bugs/buglist.cgi?resolution=FIXED&amp;resolution=DUPLICATE&amp;classification=Technology&amp;list_id=10006180&amp;order=Importance&amp;product=EGit&amp;query_format=advanced&amp;target_milestone=4.3" target="egit_external"> 19 Bugs and 1 enhancement requests</a> were closed
+ <a href="https://bugs.eclipse.org/bugs/buglist.cgi?resolution=FIXED&amp;resolution=DUPLICATE&amp;classification=Technology&amp;list_id=10006180&amp;order=Importance&amp;product=EGit&amp;query_format=advanced&amp;target_milestone=4.4" target="egit_external"> 32 Bugs and 3 enhancement requests</a> were closed
</p><hr class="navigation-separator"/>
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
<tr>
<td style="width: 20%" align="left">
- <a href="4.3.html" title="EGit 4.3 New and Noteworthy">
+ <a href="4.4.html" title="EGit 4.4 New and Noteworthy">
<img alt="Previous" border="0" src="../../../images/prev.gif"/>
</a>
</td>
<td style="width: 60%" align="center">
- <a href="4.3.html" title="EGit 4.3 New and Noteworthy">
- <img alt="EGit 4.3 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ <a href="4.4.html" title="EGit 4.4 New and Noteworthy">
+ <img alt="EGit 4.4 New and Noteworthy" border="0" src="../../../images/home.gif"/>
</a>
</td>
<td style="width: 20%" align="right">
@@ -52,7 +52,7 @@
</td>
</tr>
<tr>
- <td style="width: 20%" align="left" valign="top">EGit 4.3 New and Noteworthy</td>
+ <td style="width: 20%" align="left" valign="top">EGit 4.4 New and Noteworthy</td>
<td style="width: 60%" align="center"></td>
<td style="width: 20%" align="right" valign="top">Contributors</td>
</tr>
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.3/Contributors.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.4/Contributors.html
index a68f9bff77..a38c534994 100644
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.3/Contributors.html
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.4/Contributors.html
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>EGit 4.3 New and Noteworthy - Contributors</title>
+ <title>EGit 4.4 New and Noteworthy - Contributors</title>
<link type="text/css" rel="stylesheet" href="../../../book.css"/>
</head>
<body>
@@ -31,16 +31,16 @@
</table><hr class="navigation-separator"/>
<h1 id="Contributors">Contributors</h1>
<p>The following 11 developers worked on this release:</p>
- <p>Andre Bossert,
+ <p>Alena Laskavaia,
Andrey Loskutov,
- Dani Megert,
- Frank Jakop,
+ Jon Ander Peñalba,
Lars Vogel,
- Laurent Delaigue,
- Markus Keller,
Matthias Sohn,
Max Hohenegger,
+ Michael Keppler,
Mickael Istria,
+ Patrick-Jeffrey Pollo Guilbert,
+ Stephane Bouchet,
Thomas Wolf</p><hr class="navigation-separator"/>
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
<tr>
@@ -50,8 +50,8 @@
</a>
</td>
<td style="width: 60%" align="center">
- <a href="4.3.html" title="EGit 4.3 New and Noteworthy">
- <img alt="EGit 4.3 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ <a href="4.4.html" title="EGit 4.4 New and Noteworthy">
+ <img alt="EGit 4.4 New and Noteworthy" border="0" src="../../../images/home.gif"/>
</a>
</td>
<td style="width: 20%" align="right">
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.3/Updating-This-Document.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.4/Updating-This-Document.html
index c344a70b17..f82a2837c4 100644
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.3/Updating-This-Document.html
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.4/Updating-This-Document.html
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>EGit 4.3 New and Noteworthy - Updating This Document</title>
+ <title>EGit 4.4 New and Noteworthy - Updating This Document</title>
<link type="text/css" rel="stylesheet" href="../../../book.css"/>
</head>
<body>
@@ -29,7 +29,7 @@
<p> This document is maintained in a collaborative wiki. If you wish to
update or modify this document please visit
- <a href="http://wiki.eclipse.org/EGit/New_and_Noteworthy/4.3" target="egit_external">http://wiki.eclipse.org/EGit/New_and_Noteworthy/4.3</a>
+ <a href="http://wiki.eclipse.org/EGit/New_and_Noteworthy/4.4" target="egit_external">http://wiki.eclipse.org/EGit/New_and_Noteworthy/4.4</a>
</p><hr class="navigation-separator"/>
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
<tr>
@@ -39,8 +39,8 @@
</a>
</td>
<td style="width: 60%" align="center">
- <a href="4.3.html" title="EGit 4.3 New and Noteworthy">
- <img alt="EGit 4.3 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ <a href="4.4.html" title="EGit 4.4 New and Noteworthy">
+ <img alt="EGit 4.4 New and Noteworthy" border="0" src="../../../images/home.gif"/>
</a>
</td>
<td style="width: 20%" align="right"></td>
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html
index 9c1c24eef2..c4e6469fc6 100644
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html
@@ -292,7 +292,7 @@
<p>You can press
<b>Finish</b> on this page or press
<b>Next</b> if you are working with
- <a href="http://code.google.com/p/gerrit/" target="egit_external">Gerrit Code Review</a> and you want to configure your repository accordingly.
+ <a href="https://www.gerritcodereview.com/" target="egit_external">Gerrit Code Review</a> and you want to configure your repository accordingly.
</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
@@ -633,11 +633,17 @@
<br/>
</p>
<h2 id="Working_with_Gerrit">Working with Gerrit</h2>
- <p>If you are working with Gerrit (
- <a href="http://code.google.com/p/gerrit/" target="egit_external">http://code.google.com/p/gerrit/</a>), EGit allows you to conveniently push and fetch changes to and from the Gerrit servers.
+ <p>If you are working with
+ <a href="https://www.gerritcodereview.com/" target="egit_external">Gerrit Code Review</a>, EGit allows you to conveniently push and fetch changes to and from the Gerrit servers.
</p>
<h3 id="Enabling_Gerrit_for_a_repository">Enabling Gerrit for a repository</h3>
- <p>Gerrit operation will not appear in any menus unless you configure your repository first. To do that, open the Git Repositories view and browse down to the
+ <p>When a repository is cloned in EGit from a Gerrit server using a <code>http</code>, <code>https</code>, or <code>ssh</code> URI, EGit will automatically set up the clone for use with Gerrit. The repository clone is configured such that</p>
+ <ul>
+ <li>fetching also fetches the review notes from Gerrit,</li>
+ <li>pushing by default pushes the commits for review, and</li>
+ <li>commit messages automatically get a Gerrit <code>Change-Id</code> unless they already have one.</li>
+ </ul>
+ <p>If a repository cloned from a Gerrit server outside of EGit is used in EGit, the clone may not be set up such that EGit recognizes it as a Gerrit repository. Gerrit operations in EGit will not appear in any menus unless you configure your repository first. To do that, open the Git Repositories view and browse down to the
<b>Remote</b> that represents the Git repository server you want to use and select
<b>Gerrit Configuration...</b>.
</p>
@@ -648,11 +654,12 @@
</p>
<p>A dialog will appear that lets you select or enter a URI and branch name:</p>
<p>
- <img border="0" src="images/Egit-3.1-PushChangeToGerritDialog.png"/>
+ <img border="0" src="images/Egit-4.4-PushChangeToGerritDialog.png"/>
</p>
<ul>
<li>In the URI combo, select or enter the URI that points to your Gerrit instance; the combo will be pre-filled with all URIs defined in any remote of your current Repository; in addition you can type any URI into this field</li>
<li>In the Gerrit Branch field, enter the name of the branch to select the review queue your changes will be be pushed to</li>
+ <li>Optionally, enable the topic and enter a topic identifier. EGit proposes the last used topic for the local branch being pushed, or the local branch name.</li>
</ul>
<p>The dialog also offers a content assist for the Gerrit branch. Simply press "Ctrl+Space" to activate this (consult the tooltip that appears when hovering over the little bulb decorator near the Gerrit Branch field). The remote tracking branches for the current repository will be shown. Note that this content assist is filtered, so in order to see all proposals, you need to make sure to have the Gerrit Branch field empty before requesting the content assist.</p>
<p>Upon clicking
@@ -701,6 +708,7 @@
<p>
<img border="0" src="images/Egit-3.1-GerritDownloadCommand.png"/>
</p>
+ <p>The Change field is also automatically filled in (and content assist is triggered) if the clipboard contains a web URL pointing to a Gerrit change, or the change number part of such a URL (numbers separated by "/"), or a plain change number.</p>
<h2 id="Working_with_Gitflow">Working with Gitflow</h2>
<p>If you are using Gitflow (
<a href="http://nvie.com/posts/a-successful-git-branching-model/" target="egit_external">http://nvie.com/posts/a-successful-git-branching-model/</a>), EGit allows you to work with Gitflow operations, managing feature, release and hotfix branches.
@@ -1059,7 +1067,7 @@ Signed-off-by: William Shakespeare &lt;will.from@the.past&gt;
<ul>
<li>If there is an entry in a bug tracking system for the change to be committed it is a good idea to add it here as a bug tag</li>
<li>
- <a href="http://code.google.com/p/gerrit/" target="egit_external">Gerrit Code Review</a> uses the
+ <a href="https://www.gerritcodereview.com/" target="egit_external">Gerrit Code Review</a> uses the
<i>Change-Id:</i> footer to correlate different patchsets of a change evolving during the review process towards the finally accepted patch. To generate a Gerrit Change-Id click
<b>Compute Change-Id for Gerrit Code Review</b>; the ID will be generated on commit, until then a null Change-Id is shown as a placeholder. With the EGit configuration parameter
<b>gerrit.createchangeid</b> set to true the corresponding checkbox in the Commit Dialog is always preselected. This parameter can be set on repository level, on system level or on user level. See
@@ -2304,7 +2312,7 @@ Sein oder nicht sein
<p>It is also possible to add, remove, or change Fetch/Push Specifications for an existing Remote configuration using the context menu.</p>
<h5 id="Gerrit_Configuration">Gerrit Configuration</h5>
<p>If you work with
- <a href="http://code.google.com/p/gerrit/" target="egit_external">Gerrit Code Review</a> as remote repository server you can
+ <a href="https://www.gerritcodereview.com/" target="egit_external">Gerrit Code Review</a> as remote repository server you can
</p>
<ul>
<li>specify the push configuration used to push changes to code review</li>
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-4.4-PushChangeToGerritDialog.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-4.4-PushChangeToGerritDialog.png
new file mode 100644
index 0000000000..cbbc1ad908
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-4.4-PushChangeToGerritDialog.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.3/4.3.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.3/4.3.html
deleted file mode 100644
index 60f5e64623..0000000000
--- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.3/4.3.html
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>JGit 4.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">JGit 4.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="Bug-Fixes.html" title="Bug Fixes">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top"></td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Bug Fixes</td>
- </tr>
- </table><hr class="navigation-separator"/>
- <h1 id="JGit">JGit</h1>
- <h2 id="Git_attributes_support">Git attributes support</h2>
- <p>Implement git attributes support for</p>
- <ul>
- <li>text attributes</li>
- <li>eol attributes</li>
- <li>macros</li>
- <li>binary macro</li>
- </ul>
- <h2 id="Large_File_Storage_.28LFS.29_Extension">Large File Storage (LFS) Extension</h2>
- <p>Git Large File Storage (LFS) is a Git extension for versioning large files</p>
- <p>LFS replaces large files such as audio samples, videos, datasets, and graphics with text pointers inside Git, while storing the file contents on a remote LFS server.</p>
- <p>In 4.3 the following features to support LFS in JGit were implemented</p>
- <ul>
- <li>SHA-256 abstraction</li>
- <li>command line command debug-lfs-store to run LFS test server</li>
- <li>LFS server: support LFS protocol and a file system based LFS storage (used in Gerrit lfs-storage-fs plugin)</li>
- <li>LFS server: support Amazon S3 based storage for LFS (used in Gerrit lfs-storage-s3 plugin)</li>
- <li>fix FileLfsRepository to make it thread safe</li>
- </ul>
- <h2 id="RefTree">RefTree</h2>
- <p>RefTree enables JGit to version refs (branches, tags and symbolic refs) in a Git tree and enables atomic push which is a precondition to implement Git Ketch.</p>
- <p>A group of updates can be applied by updating the tree in one step, writing out a new root tree, and storing its SHA-1. If references are stored in RefTrees, comparing two repositories is a matter of checking if two SHA-1s are identical. Without RefTrees comparing two repositories requires listing all references and comparing the sets.</p>
- <p>Track the "refs/" directory as a root tree by storing references that point directly at an object as a GITLINK entry in the tree. For example "refs/heads/master" is written as "heads/master".</p>
- <p>Annotated tags also store their peeled value with ^{} suffix, using "tags/v1.0" and "tags/v1.0^{}" GITLINK entries.</p>
- <p>Symbolic references are written as SYMLINK entries with the blob of the symlink carrying the name of the symbolic reference target.</p>
- <ul>
- <li>HEAD is outside of "refs/" namespace so it is stored as a special "..HEAD" entry.</li>
- <li>debug-rebuild-ref-tree command line command to migrate refs to RefTreeDatabase</li>
- <li>copy HEAD into RefTree</li>
- <li>RefTreeDatabase: Allow ORIG_HEAD, etc. on non-bare repositories</li>
- <li>RefTreeDatabase: Expose bootstrap refs in getAdditionalRefs</li>
- </ul>
- <h2 id="Git_Ketch">Git Ketch</h2>
- <p>Git Ketch is a multi-master Git repository management system. Writes are successful only if a majority of participant servers agree. Acknowledged writes are durable against server failures as a majority of the participants store all required objects.</p>
- <p>Git Ketch is modeled on the Raft Consensus Algorithm. A ketch sailing vessel is faster and more nimble than a raft. It can also carry more source codes. Git Ketch front-loads replication costs, which vaguely resembles a ketch sailing vessel's distinguishing feature of the main mast on the front of the ship.</p>
- <p>In 4.3 the following Ketch features were implemented</p>
- <ul>
- <li>basic replication system</li>
- <li>simple map of running leader instances</li>
- <li>intercept push and route it through Ketch</li>
- <li>daemon: Add --ketch=LEADER flag</li>
- </ul>
- <h2 id="Repo_command">Repo command</h2>
- <ul>
- <li>add ignoreRemoteFailures option to RepoCommand</li>
- <li>support revision in remote tag</li>
- </ul>
- <h2 id="Miscellaneous">Miscellaneous</h2>
- <ul>
- <li>implement configuration option DIR_NO_GITLINKS</li>
- </ul>
- <h2 id="Build_and_Release_Engineering">Build and Release Engineering</h2>
- <ul>
- <li>Enable building JGit and Gerrit in the same Buck build to speed up build for features spanning JGit and Gerrit</li>
- </ul><hr class="navigation-separator"/>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <td style="width: 20%" align="left"></td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right">
- <a href="Bug-Fixes.html" title="Bug Fixes">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top"></td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Bug Fixes</td>
- </tr>
- </table>
- </body>
-</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.4/4.4.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.4/4.4.html
new file mode 100644
index 0000000000..c5ccf8a2f3
--- /dev/null
+++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.4/4.4.html
@@ -0,0 +1,60 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title>JGit 4.4 New and Noteworthy</title>
+ <link type="text/css" rel="stylesheet" href="../../../book.css"/>
+ </head>
+ <body>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <th style="width: 100%" align="center" colspan="3">JGit 4.4 New and Noteworthy</th>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left"></td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right">
+ <a href="Bug-Fixes.html" title="Bug Fixes">
+ <img alt="Next" border="0" src="../../../images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top"></td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Bug Fixes</td>
+ </tr>
+ </table><hr class="navigation-separator"/>
+ <h1 id="JGit">JGit</h1>
+ <h2 id="Features">Features</h2>
+ <ul>
+ <li>JGit command line: allow to call git init with specific directory</li>
+ <li>Support git config [include] section with absolute path</li>
+ <li>LogCommand: enable to set filter to only show merge or non-merge commits</li>
+ <li>ApplyCommand: Allow setting FileMode to executable when applying patches</li>
+ <li>Make BaseReceivePack.setAtomic public</li>
+ <li>Support per-BatchRefUpdate atomic transactions</li>
+ <li>Expose conflicting files in CheckoutConflictException</li>
+ </ul>
+ <h2 id="Releng">Releng</h2>
+ <ul>
+ <li>Updated Maven plugins</li>
+ </ul><hr class="navigation-separator"/>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <td style="width: 20%" align="left"></td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right">
+ <a href="Bug-Fixes.html" title="Bug Fixes">
+ <img alt="Next" border="0" src="../../../images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top"></td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Bug Fixes</td>
+ </tr>
+ </table>
+ </body>
+</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.3/Bug-Fixes.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.4/Bug-Fixes.html
index 0345ab6afb..8f40211acc 100644
--- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.3/Bug-Fixes.html
+++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.4/Bug-Fixes.html
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>JGit 4.3 New and Noteworthy - Bug Fixes</title>
+ <title>JGit 4.4 New and Noteworthy - Bug Fixes</title>
<link type="text/css" rel="stylesheet" href="../../../book.css"/>
</head>
<body>
@@ -12,7 +12,7 @@
</tr>
<tr>
<td style="width: 20%" align="left">
- <a href="4.3.html" title="JGit 4.3 New and Noteworthy">
+ <a href="4.4.html" title="JGit 4.4 New and Noteworthy">
<img alt="Previous" border="0" src="../../../images/prev.gif"/>
</a>
</td>
@@ -24,25 +24,25 @@
</td>
</tr>
<tr>
- <td style="width: 20%" align="left" valign="top">JGit 4.3 New and Noteworthy</td>
+ <td style="width: 20%" align="left" valign="top">JGit 4.4 New and Noteworthy</td>
<td style="width: 60%" align="center"></td>
<td style="width: 20%" align="right" valign="top">Contributors</td>
</tr>
</table><hr class="navigation-separator"/>
<h1 id="Bug_Fixes">Bug Fixes</h1>
<p>
- <a href="https://bugs.eclipse.org/bugs/buglist.cgi?classification=Technology&amp;list_id=10006180&amp;order=Importance&amp;product=JGit&amp;query_format=advanced&amp;resolution=FIXED&amp;resolution=DUPLICATE&amp;target_milestone=4.3" target="egit_external"> 3 Bugs and 3 enhancement requests</a> were closed
+ <a href="https://bugs.eclipse.org/bugs/buglist.cgi?classification=Technology&amp;list_id=10006180&amp;order=Importance&amp;product=JGit&amp;query_format=advanced&amp;resolution=FIXED&amp;resolution=DUPLICATE&amp;target_milestone=4.4" target="egit_external"> 4 Bugs</a> were closed
</p><hr class="navigation-separator"/>
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
<tr>
<td style="width: 20%" align="left">
- <a href="4.3.html" title="JGit 4.3 New and Noteworthy">
+ <a href="4.4.html" title="JGit 4.4 New and Noteworthy">
<img alt="Previous" border="0" src="../../../images/prev.gif"/>
</a>
</td>
<td style="width: 60%" align="center">
- <a href="4.3.html" title="JGit 4.3 New and Noteworthy">
- <img alt="JGit 4.3 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ <a href="4.4.html" title="JGit 4.4 New and Noteworthy">
+ <img alt="JGit 4.4 New and Noteworthy" border="0" src="../../../images/home.gif"/>
</a>
</td>
<td style="width: 20%" align="right">
@@ -52,7 +52,7 @@
</td>
</tr>
<tr>
- <td style="width: 20%" align="left" valign="top">JGit 4.3 New and Noteworthy</td>
+ <td style="width: 20%" align="left" valign="top">JGit 4.4 New and Noteworthy</td>
<td style="width: 60%" align="center"></td>
<td style="width: 20%" align="right" valign="top">Contributors</td>
</tr>
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.3/Contributors.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.4/Contributors.html
index ee1420c9dc..8a7a180536 100644
--- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.3/Contributors.html
+++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.4/Contributors.html
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>JGit 4.3 New and Noteworthy - Contributors</title>
+ <title>JGit 4.4 New and Noteworthy - Contributors</title>
<link type="text/css" rel="stylesheet" href="../../../book.css"/>
</head>
<body>
@@ -30,26 +30,20 @@
</tr>
</table><hr class="navigation-separator"/>
<h1 id="Contributors">Contributors</h1>
- <p>The following 19 developers worked on this release of JGit :</p>
- <p>Chris Gavin,
+ <p>The following 13 developers worked on this release of JGit :</p>
+ <p>Alcemir Santos,
Christian Halstrick,
- David Ostrovsky,
+ Dave Borowitz,
David Pursehouse,
- Hugo Arès,
- Ivan Motsch,
Jonathan Nieder,
- Laurent Delaigue,
+ Marco Miller,
Matthias Sohn,
- Mike Williams,
- Philipp Marx,
- Preben Ingvaldsen,
+ Mike Edgar,
+ Nadav Cohen,
+ Ned Twigg,
Rüdiger Herrmann,
- Saša Živkov,
- Shawn Pearce,
- Terry Parker,
- Thomas Wolf,
- Yuxuan 'fishy' Wang,
- XinTong Wang</p><hr class="navigation-separator"/>
+ Stefan Beller,
+ Terry Parker</p><hr class="navigation-separator"/>
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
<tr>
<td style="width: 20%" align="left">
@@ -58,8 +52,8 @@
</a>
</td>
<td style="width: 60%" align="center">
- <a href="4.3.html" title="JGit 4.3 New and Noteworthy">
- <img alt="JGit 4.3 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ <a href="4.4.html" title="JGit 4.4 New and Noteworthy">
+ <img alt="JGit 4.4 New and Noteworthy" border="0" src="../../../images/home.gif"/>
</a>
</td>
<td style="width: 20%" align="right">
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.3/Updating-This-Document.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.4/Updating-This-Document.html
index ce9220f2ba..65a5403f77 100644
--- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.3/Updating-This-Document.html
+++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.4/Updating-This-Document.html
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>JGit 4.3 New and Noteworthy - Updating This Document</title>
+ <title>JGit 4.4 New and Noteworthy - Updating This Document</title>
<link type="text/css" rel="stylesheet" href="../../../book.css"/>
</head>
<body>
@@ -29,7 +29,7 @@
<p> This document is maintained in a collaborative wiki. If you wish to
update or modify this document please visit
- <a href="http://wiki.eclipse.org/JGit/New_and_Noteworthy/4.3" target="egit_external">http://wiki.eclipse.org/JGit/New_and_Noteworthy/4.3</a>
+ <a href="http://wiki.eclipse.org/JGit/New_and_Noteworthy/4.4" target="egit_external">http://wiki.eclipse.org/JGit/New_and_Noteworthy/4.4</a>
</p><hr class="navigation-separator"/>
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
<tr>
@@ -39,8 +39,8 @@
</a>
</td>
<td style="width: 60%" align="center">
- <a href="4.3.html" title="JGit 4.3 New and Noteworthy">
- <img alt="JGit 4.3 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ <a href="4.4.html" title="JGit 4.4 New and Noteworthy">
+ <img alt="JGit 4.4 New and Noteworthy" border="0" src="../../../images/home.gif"/>
</a>
</td>
<td style="width: 20%" align="right"></td>

Back to the top