Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/5.4.html13
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/Contributors.html8
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/See-Also.html61
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/Updating-This-Document.html8
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/images/Check_Out_This_Version.pngbin249072 -> 62631 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/images/EGit_History_Whitespace.pngbin0 -> 25958 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/images/EGit_Repo_View_Filters.pngbin112637 -> 29492 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/images/EGit_Repo_View_Filters_Dialog.pngbin42148 -> 11233 bytes
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.4/5.4.html16
-rw-r--r--org.eclipse.egit.doc/help/toc.xml3
10 files changed, 94 insertions, 15 deletions
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/5.4.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/5.4.html
index 4edfe27310..28e3cae05b 100644
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/5.4.html
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/5.4.html
@@ -32,8 +32,8 @@
<i>Preferences&rarr;Team&rarr;Git</i> to choose between "Apache MINA sshd" (default) and the older "JSch" library.)
</p>
<dl>
- <dd>On Java versions older than 8u161, you may need to download and install the "
- <a href="https://www.oracle.com/technetwork/java/javase/downloads/jce-all-download-5170447.html" target="egit_external">JCE Unlimited Strength Jurisdiction Policy Files</a>" for this to work. OpenSSH uses the AES encryption with 256bit keys, which is available in older Java only with this extension. On newer Java versions, "unlimited strength" encryption is enabled by default, so you need not do anything.
+ <dd>On Java versions older than 8u161, you may need to download and install the
+ <a href="https://www.oracle.com/technetwork/java/javase/downloads/jce-all-download-5170447.html" target="egit_external">"JCE Unlimited Strength Jurisdiction Policy Files"</a> for this to work. OpenSSH uses the AES encryption with 256bit keys, which is available in older Java only with this extension. On newer Java versions, "unlimited strength" encryption is enabled by default, so you need not do anything.
</dd>
</dl>
<p>We plan to remove the old JSch SSH implementation completely in a future release of EGit.</p>
@@ -52,9 +52,16 @@
<h2 id="Checking_out_Files_from_a_Commit">Checking out Files from a Commit</h2>
<p>In the Git History view there is a new command in the context menu on the file list to check out the selected file versions from that commit. This can be useful to revert individual files to an earlier state, or to a state on another branch.</p>
<p>
- <img alt="Screenshot of the Git History view showing the new check-out command" border="0" src="images/Check_Out_This_Version.png"/>
+ <img alt="Screenshot of the Git History view showing the new check-out command." border="0" src="images/Check_Out_This_Version.png"/>
</p>
<p>This command is also available in the Commit Viewer (also for stashes), and in the outline view of the Commit Viewer's unified diff page. The check-out skips files deleted in that commit and submodules contained in the selection. If the check-out would overwrite uncommitted changes, such as when a file to be checked out is modified in the workspace, the user is asked to confirm overwriting.</p>
+ <h2 id="Showing_Whitespace_Characters_in_the_Diff_in_the_History_View">Showing Whitespace Characters in the Diff in the History View</h2>
+ <p>The diff viewer in the Git History view can now show whitespace characters:</p>
+ <p>
+ <img alt="Screenshot of the Git History view with the context menu on the diff viewer visible and showing whitespace characters in the diff viewer." border="0" src="images/EGit_History_Whitespace.png"/>
+ </p>
+ <p>The diff viewer is located in the bottom-left part of the view, below the commit message. When files changed in a commit are selected in the file list bottom-right, the diff viewer shows a unified diff of the changes made to those files in that commit. (For performance reasons, the diff is truncated after 10'000 lines; to see a full unified diff, open the commit in the Commit Viewer via the context menu in the commit table.)</p>
+ <p>This diff viewer has now a little context menu where the user can enable or disable showing whitespace characters.</p>
<h2 id="Other_Changes">Other Changes</h2>
<p>EGit 5.4.0 includes lots of less noticeable improvements in the UI, plus a number of bug fixes. The complete list of new features and bug fixes is available in the
<a href="https://projects.eclipse.org/projects/technology.egit/releases/5.4.0/" target="egit_external">release notes</a>.
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/Contributors.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/Contributors.html
index 9fea168520..124a613652 100644
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/Contributors.html
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/Contributors.html
@@ -18,7 +18,7 @@
</td>
<td style="width: 60%" align="center"></td>
<td style="width: 20%" align="right">
- <a href="Updating-This-Document.html" title="Updating This Document">
+ <a href="See-Also.html" title="See Also">
<img alt="Next" border="0" src="../../../images/next.gif"/>
</a>
</td>
@@ -26,7 +26,7 @@
<tr>
<td style="width: 20%" align="left" valign="top">EGit 5.4 New and Noteworthy</td>
<td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Updating This Document</td>
+ <td style="width: 20%" align="right" valign="top">See Also</td>
</tr>
</table><hr class="navigation-separator"/>
<h1 id="Contributors">Contributors</h1>
@@ -52,7 +52,7 @@
</a>
</td>
<td style="width: 20%" align="right">
- <a href="Updating-This-Document.html" title="Updating This Document">
+ <a href="See-Also.html" title="See Also">
<img alt="Next" border="0" src="../../../images/next.gif"/>
</a>
</td>
@@ -60,7 +60,7 @@
<tr>
<td style="width: 20%" align="left" valign="top">EGit 5.4 New and Noteworthy</td>
<td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Updating This Document</td>
+ <td style="width: 20%" align="right" valign="top">See Also</td>
</tr>
</table>
</body>
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/See-Also.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/See-Also.html
new file mode 100644
index 0000000000..68d3dd629a
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/See-Also.html
@@ -0,0 +1,61 @@
+<?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 5.4 New and Noteworthy - See Also</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">See Also</th>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="Contributors.html" title="Contributors">
+ <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="Updating-This-Document.html" title="Updating This Document">
+ <img alt="Next" border="0" src="../../../images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top">Contributors</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Updating This Document</td>
+ </tr>
+ </table><hr class="navigation-separator"/>
+ <h1 id="See_Also">See Also</h1>
+ <p>See also the
+ <a href="../../../JGit/New_and_Noteworthy/5.4/5.4.html" title="JGit/New_and_Noteworthy/5.4">new features in JGit</a> for additional information.
+ </p><hr class="navigation-separator"/>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="Contributors.html" title="Contributors">
+ <img alt="Previous" border="0" src="../../../images/prev.gif"/>
+ </a>
+ </td>
+ <td style="width: 60%" align="center">
+ <a href="5.4.html" title="EGit 5.4 New and Noteworthy">
+ <img alt="EGit 5.4 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ </a>
+ </td>
+ <td style="width: 20%" align="right">
+ <a href="Updating-This-Document.html" title="Updating This Document">
+ <img alt="Next" border="0" src="../../../images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top">Contributors</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Updating This Document</td>
+ </tr>
+ </table>
+ </body>
+</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/Updating-This-Document.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/Updating-This-Document.html
index 845e505410..1f3de396b1 100644
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/Updating-This-Document.html
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/Updating-This-Document.html
@@ -12,7 +12,7 @@
</tr>
<tr>
<td style="width: 20%" align="left">
- <a href="Contributors.html" title="Contributors">
+ <a href="See-Also.html" title="See Also">
<img alt="Previous" border="0" src="../../../images/prev.gif"/>
</a>
</td>
@@ -20,7 +20,7 @@
<td style="width: 20%" align="right"></td>
</tr>
<tr>
- <td style="width: 20%" align="left" valign="top">Contributors</td>
+ <td style="width: 20%" align="left" valign="top">See Also</td>
<td style="width: 60%" align="center"></td>
<td style="width: 20%" align="right" valign="top"></td>
</tr>
@@ -34,7 +34,7 @@
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
<tr>
<td style="width: 20%" align="left">
- <a href="Contributors.html" title="Contributors">
+ <a href="See-Also.html" title="See Also">
<img alt="Previous" border="0" src="../../../images/prev.gif"/>
</a>
</td>
@@ -46,7 +46,7 @@
<td style="width: 20%" align="right"></td>
</tr>
<tr>
- <td style="width: 20%" align="left" valign="top">Contributors</td>
+ <td style="width: 20%" align="left" valign="top">See Also</td>
<td style="width: 60%" align="center"></td>
<td style="width: 20%" align="right" valign="top"></td>
</tr>
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/images/Check_Out_This_Version.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/images/Check_Out_This_Version.png
index b38e0196fa..6722feea0c 100644
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/images/Check_Out_This_Version.png
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/images/Check_Out_This_Version.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/images/EGit_History_Whitespace.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/images/EGit_History_Whitespace.png
new file mode 100644
index 0000000000..024c7984ff
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/images/EGit_History_Whitespace.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/images/EGit_Repo_View_Filters.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/images/EGit_Repo_View_Filters.png
index a919db6dc5..731af394d0 100644
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/images/EGit_Repo_View_Filters.png
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/images/EGit_Repo_View_Filters.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/images/EGit_Repo_View_Filters_Dialog.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/images/EGit_Repo_View_Filters_Dialog.png
index c42a27391f..e06e345633 100644
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/images/EGit_Repo_View_Filters_Dialog.png
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/images/EGit_Repo_View_Filters_Dialog.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.4/5.4.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.4/5.4.html
index ace0f44b19..88932e0b93 100644
--- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.4/5.4.html
+++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.4/5.4.html
@@ -28,18 +28,26 @@
<h1 id="JGit">JGit</h1>
<h2 id="SSH_Library">SSH Library</h2>
<p>Bundle <code>org.eclipse.jgit.ssh.apache</code>, introduced in JGit 5.2.0 and implementing a new SSH session factory based on
- <a href="https://mina.apache.org/sshd-project/" target="egit_external">Apache MINA sshd</a>, has been updated to Apache MINA sshd 2.2.0.
+ <a href="https://mina.apache.org/sshd-project/" target="egit_external">Apache MINA sshd</a>, has been updated to Apache MINA sshd
+ <b>2.2.0</b>.
</p>
<p>Because of incompatible upstream interface changes, it will work only with that precise version of Apache MINA sshd.</p>
<p>Thanks to the update, the SSH support now also works for connections using
<i>encrypted</i> new-style OpenSSH private keys, for instance password-protected ed25519 keys.
</p>
<dl>
- <dd>On Java versions older than 8u161, you may need to download and install the "
- <a href="https://www.oracle.com/technetwork/java/javase/downloads/jce-all-download-5170447.html" target="egit_external">JCE Unlimited Strength Jurisdiction Policy Files</a>" for this to work. OpenSSH uses the AES encryption with 256bit keys, which is available in older Java only with this extension. On newer Java versions, "unlimited strength" encryption is enabled by default, so you need not do anything.
+ <dd>On Java versions older than 8u161, you may need to download and install the
+ <a href="https://www.oracle.com/technetwork/java/javase/downloads/jce-all-download-5170447.html" target="egit_external">"JCE Unlimited Strength Jurisdiction Policy Files"</a> for this to work. OpenSSH uses the AES encryption with 256bit keys, which is available in older Java only with this extension. On newer Java versions, "unlimited strength" encryption is enabled by default, so you need not do anything.
</dd>
</dl>
- <p>To use the SSH client based on Apache MINA sshd in the JGit command-line tools, use the option <code>--ssh apache</code>. By default JGit still uses the older JSch library for SSH, which has been updated to JSch 0.1.55.</p>
+ <p>To use the SSH client based on Apache MINA sshd in the JGit command-line tools, use the option <code>--ssh apache</code>. By default JGit still uses the older JSch library for SSH, which has been updated to JSch
+ <b>0.1.55</b>.
+ </p>
+ <h2 id="HTTP_Cookie_Support">HTTP Cookie Support</h2>
+ <p>JGit has learnt to handle cookies in HTTP connections. Cookie storage can be configured via the
+ <a href="https://git-scm.com/docs/git-config#Documentation/git-config.txt-httpcookieFile" target="egit_external">git config settings</a> <code>http.cookieFile</code> and <code>http.saveCookies</code>. These settings can also be
+ <a href="https://git-scm.com/docs/git-config#Documentation/git-config.txt-httplturlgt" target="egit_external">given per URI</a> so that different settings can be used for different servers.
+ </p>
<h2 id="Other_Changes">Other Changes</h2>
<p>The complete list of new features and bug fixes is available in the
<a href="https://projects.eclipse.org/projects/technology.jgit/releases/5.4.0/" target="egit_external">release notes</a>.
diff --git a/org.eclipse.egit.doc/help/toc.xml b/org.eclipse.egit.doc/help/toc.xml
index a77b414590..7c1e23a7cc 100644
--- a/org.eclipse.egit.doc/help/toc.xml
+++ b/org.eclipse.egit.doc/help/toc.xml
@@ -451,14 +451,17 @@
<topic href="help/EGit/New_and_Noteworthy/5.4/5.4.html#SSH_Library" label="SSH Library"></topic>
<topic href="help/EGit/New_and_Noteworthy/5.4/5.4.html#Filtering_Content_from_the_Git_Repositories_View" label="Filtering Content from the Git Repositories View"></topic>
<topic href="help/EGit/New_and_Noteworthy/5.4/5.4.html#Checking_out_Files_from_a_Commit" label="Checking out Files from a Commit"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/5.4/5.4.html#Showing_Whitespace_Characters_in_the_Diff_in_the_History_View" label="Showing Whitespace Characters in the Diff in the History View"></topic>
<topic href="help/EGit/New_and_Noteworthy/5.4/5.4.html#Other_Changes" label="Other Changes"></topic>
</topic>
<topic href="help/EGit/New_and_Noteworthy/5.4/Contributors.html" label="Contributors"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/5.4/See-Also.html" label="See Also"></topic>
<topic href="help/EGit/New_and_Noteworthy/5.4/Updating-This-Document.html" label="Updating This Document"></topic>
</topic>
<topic href="help/JGit/New_and_Noteworthy/5.4/5.4.html" label="JGit 5.4 New and Noteworthy">
<topic href="help/JGit/New_and_Noteworthy/5.4/5.4.html" label="JGit">
<topic href="help/JGit/New_and_Noteworthy/5.4/5.4.html#SSH_Library" label="SSH Library"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/5.4/5.4.html#HTTP_Cookie_Support" label="HTTP Cookie Support"></topic>
<topic href="help/JGit/New_and_Noteworthy/5.4/5.4.html#Other_Changes" label="Other Changes"></topic>
</topic>
<topic href="help/JGit/New_and_Noteworthy/5.4/Contributors.html" label="Contributors"></topic>

Back to the top