Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2011-02-11 11:05:34 -0500
committerMatthias Sohn2011-02-11 11:39:15 -0500
commitc0c1025f18e7be8b508fc2147e317add943ba7eb (patch)
tree831116d268bfd658e08a7a67f83afbeee9a8f7d8
parent3f887768bd91d475b6f975b0e6727830cd1f7ab6 (diff)
downloadegit-c0c1025f18e7be8b508fc2147e317add943ba7eb.tar.gz
egit-c0c1025f18e7be8b508fc2147e317add943ba7eb.tar.xz
egit-c0c1025f18e7be8b508fc2147e317add943ba7eb.zip
Update documentation for 0.11
Change-Id: I150b49f19b7862d074b1a378baf7d639b7b29b66 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.egit.doc/build-help.xml4
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Auto-wrapping-Commit-Messages.html59
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Cherry-pick-Support.html64
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/HTTP-Authentication.html61
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/History-View-Enhancements.html65
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Merge-Tool.html64
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/PDE-Build-Fetch-Factory.html61
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Rebase-Support.html68
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Repositories-View-Improvements.html65
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Synchronize-View-Local-Changes-in-Changeset-Mode.html63
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/CherryPick1.pngbin18307 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/EGit-0.10-RebaseConflictDialog.pngbin31208 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/EGit-0.10-StartRebaseFromRepoView.pngbin26022 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/EGit-0.10-working-tree-and-staged-changes-in-changeset.pngbin8699 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/Egit-0.10-history-commitmenu.pngbin12720 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/Egit-0.10-merge-tool.pngbin71078 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/Egit-0.10-repoview-refsupport.pngbin71148 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/0.11.html119
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/Bugs-Closed.html (renamed from org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Bugs-Closed.html)16
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/Commits.html (renamed from org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Commits.html)8
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/Updating-This-Document.html (renamed from org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Updating-This-Document.html)8
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/images/Egit-0.11-CompareWithMenu.pngbin0 -> 5452 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/images/Egit-0.11-ConfigureFetchFromUpstream.pngbin0 -> 36338 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/images/Egit-0.11-ConfigurePushToUpstream.pngbin0 -> 35132 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/images/Egit-0.11-GitTreeCompareView.pngbin0 -> 53344 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/images/Egit-0.11-fetchChangeFromGerritDialog.pngbin0 -> 22688 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/images/Egit-0.11-history-actions.pngbin0 -> 79852 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/images/Egit-0.11-project-menu.pngbin0 -> 14934 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/images/Egit-mylyn-historyview.pngbin0 -> 63923 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/images/Egit-mylyn.pngbin0 -> 51328 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/Reference.html207
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html780
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/User-Guide.html79
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/03-CompareWith.pngbin5377 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/CreateBranch.pngbin16505 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-project-menu.pngbin24149 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-repoview-repomenu.pngbin16438 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-BranchCreationDialog.pngbin0 -> 34732 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-BranchCreationFromCommitDialog.pngbin0 -> 27486 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-ConfigureFetchFromUpstream.pngbin0 -> 36338 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-ConfigurePushToUpstream.pngbin0 -> 35132 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-ContentAssistGerritChange.pngbin0 -> 54842 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-FetchResultDialog.pngbin0 -> 28509 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-GitTreeCompareView.pngbin0 -> 53344 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-GitTreeCompareViewRepo.pngbin0 -> 19165 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-ImportProjectsFromRepoView.pngbin0 -> 36659 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-PushResultDialog.pngbin0 -> 28212 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-RepoViewReferencesNode.pngbin0 -> 8990 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-RepoViewTopLevel.pngbin0 -> 3203 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-activate-task.pngbin0 -> 9960 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-clone-wizard-branch-page.pngbin0 -> 45575 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-commit-using-template.pngbin0 -> 25882 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-configure-commit-template.pngbin0 -> 37111 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-fetchChangeFromGerritDialog.pngbin0 -> 22688 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-getstarted-compare.pngbin0 -> 34796 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-getstarted-history1.pngbin0 -> 17417 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-getstarted-history2.pngbin0 -> 20012 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-getstarted-ignore-added.pngbin0 -> 7628 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-import-projects-add-dialog.pngbin0 -> 35297 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-import-projects-filled-list.pngbin0 -> 35989 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-import-projects-select-wizard.pngbin0 -> 31743 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-initialConfigurationDialog.pngbin0 -> 17600 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-project-menu.pngbin0 -> 14934 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-repoview-repomenu.pngbin0 -> 7478 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-workbench-menu.pngbin0 -> 11859 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-workbench-toolbar.pngbin0 -> 4516 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-clone-wizard-branch-page.pngbin35878 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-compare.pngbin133735 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-create-project.pngbin47030 -> 18252 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-history1.pngbin71850 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-history2.pngbin92442 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-ignore-added.pngbin23314 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-project-created.pngbin47871 -> 18215 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-share.pngbin36442 -> 21089 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-contextMenuFolder.pngbin8738 -> 13543 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-contextMenuSingleFile.pngbin16823 -> 1561 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-contextMenuTwoFiles.pngbin2695 -> 3630 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-add-dialog.pngbin50841 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-filled-list.pngbin41455 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-select-wizard.pngbin75551 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-share-manually.pngbin60084 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit_no_home.pngbin0 -> 16909 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrCreateBranch.pngbin47436 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrImportNodes.pngbin34602 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrSearchDialog.pngbin18113 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrTopLevelNodes.pngbin3345 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/0.10.html50
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/Git-Porcelain-API-Updates.html75
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/HTTP-basic-and-digest-authentication.html61
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/Performance-New-IndexDiffFilter.html60
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.11/0.11.html (renamed from org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/0.10.html)25
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.11/Bugs-Closed.html (renamed from org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/Bugs-Closed.html)16
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.11/Commits.html (renamed from org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/Commits.html)8
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.11/Features.html (renamed from org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/User-Guide.html)37
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.11/Updating-This-Document.html (renamed from org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/Updating-This-Document.html)8
-rw-r--r--org.eclipse.egit.doc/help/JGit/User_Guide/Advanced-Topics.html124
-rw-r--r--org.eclipse.egit.doc/help/JGit/User_Guide/Concepts.html49
-rw-r--r--org.eclipse.egit.doc/help/JGit/User_Guide/Reference.html34
-rw-r--r--org.eclipse.egit.doc/help/images/next.gifbin327 -> 326 bytes
-rw-r--r--org.eclipse.egit.doc/help/images/prev.gifbin327 -> 326 bytes
-rw-r--r--org.eclipse.egit.doc/help/toc.xml108
101 files changed, 1045 insertions, 1401 deletions
diff --git a/org.eclipse.egit.doc/build-help.xml b/org.eclipse.egit.doc/build-help.xml
index d9c4ba78c..b7973f6dc 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/0.10" title="EGit 0.10 New and Noteworthy" />
- <path name="JGit/New_and_Noteworthy/0.10" title="JGit 0.10 New and Noteworthy" />
+ <path name="EGit/New_and_Noteworthy/0.11" title="EGit 0.11 New and Noteworthy" />
+ <path name="JGit/New_and_Noteworthy/0.11" title="JGit 0.11 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/0.10/Auto-wrapping-Commit-Messages.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Auto-wrapping-Commit-Messages.html
deleted file mode 100644
index cc85c8418..000000000
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Auto-wrapping-Commit-Messages.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 0.10 New and Noteworthy - Auto-wrapping Commit Messages</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">Auto-wrapping Commit Messages</th>
- </tr>
- <tr>
- <td style="width: 20%" align="left">
- <a href="History-View-Enhancements.html" title="History View Enhancements">
- <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="PDE-Build-Fetch-Factory.html" title="PDE Build Fetch Factory">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">History View Enhancements</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">PDE Build Fetch Factory</td>
- </tr>
- </table><hr/>
- <h1 id="Auto-wrapping_Commit_Messages">Auto-wrapping Commit Messages</h1>
- <p>The EGit commit dialog can now auto-wrap the commit message.</p><hr/>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <td style="width: 20%" align="left">
- <a href="History-View-Enhancements.html" title="History View Enhancements">
- <img alt="Previous" border="0" src="../../../images/prev.gif"/>
- </a>
- </td>
- <td style="width: 60%" align="center">
- <a href="0.10.html" title="EGit 0.10 New and Noteworthy">
- <img alt="EGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/>
- </a>
- </td>
- <td style="width: 20%" align="right">
- <a href="PDE-Build-Fetch-Factory.html" title="PDE Build Fetch Factory">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">History View Enhancements</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">PDE Build Fetch Factory</td>
- </tr>
- </table>
- </body>
-</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Cherry-pick-Support.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Cherry-pick-Support.html
deleted file mode 100644
index 74f376cff..000000000
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Cherry-pick-Support.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 0.10 New and Noteworthy - Cherry-pick Support</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">Cherry-pick Support</th>
- </tr>
- <tr>
- <td style="width: 20%" align="left">
- <a href="Rebase-Support.html" title="Rebase Support">
- <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="Merge-Tool.html" title="Merge Tool">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">Rebase Support</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Merge Tool</td>
- </tr>
- </table><hr/>
- <h1 id="Cherry-pick_Support">Cherry-pick Support</h1>
- <p>EGit now supports
- <a href="../../../EGit/User_Guide/Tasks.html#Cherry_Picking" title="EGit/User_Guide#Cherry_Picking">Cherry-pick</a>
- </p>
- <p>
- <img border="0" src="images/CherryPick1.png"/>
- </p><hr/>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <td style="width: 20%" align="left">
- <a href="Rebase-Support.html" title="Rebase Support">
- <img alt="Previous" border="0" src="../../../images/prev.gif"/>
- </a>
- </td>
- <td style="width: 60%" align="center">
- <a href="0.10.html" title="EGit 0.10 New and Noteworthy">
- <img alt="EGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/>
- </a>
- </td>
- <td style="width: 20%" align="right">
- <a href="Merge-Tool.html" title="Merge Tool">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">Rebase Support</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Merge Tool</td>
- </tr>
- </table>
- </body>
-</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/HTTP-Authentication.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/HTTP-Authentication.html
deleted file mode 100644
index 018e5a6fe..000000000
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/HTTP-Authentication.html
+++ /dev/null
@@ -1,61 +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 0.10 New and Noteworthy - HTTP Authentication</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">HTTP Authentication</th>
- </tr>
- <tr>
- <td style="width: 20%" align="left">
- <a href="Synchronize-View-Local-Changes-in-Changeset-Mode.html" title="Synchronize View - Local Changes in Changeset Mode">
- <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="Repositories-View-Improvements.html" title="Repositories View Improvements">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">Synchronize View - Local Changes in Changeset Mode</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Repositories View Improvements</td>
- </tr>
- </table><hr/>
- <h1 id="HTTP_Authentication">HTTP Authentication</h1>
- <p>EGit now supports HTTP basic and digest authentication. This helps users sitting behind firewalls
- which often block <code>git:</code> and <code>ssh:</code> traffic.
- User credentials can be optionally stored in the Eclipse Secure Store.</p><hr/>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <td style="width: 20%" align="left">
- <a href="Synchronize-View-Local-Changes-in-Changeset-Mode.html" title="Synchronize View - Local Changes in Changeset Mode">
- <img alt="Previous" border="0" src="../../../images/prev.gif"/>
- </a>
- </td>
- <td style="width: 60%" align="center">
- <a href="0.10.html" title="EGit 0.10 New and Noteworthy">
- <img alt="EGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/>
- </a>
- </td>
- <td style="width: 20%" align="right">
- <a href="Repositories-View-Improvements.html" title="Repositories View Improvements">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">Synchronize View - Local Changes in Changeset Mode</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Repositories View Improvements</td>
- </tr>
- </table>
- </body>
-</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/History-View-Enhancements.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/History-View-Enhancements.html
deleted file mode 100644
index 6bcfaae77..000000000
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/History-View-Enhancements.html
+++ /dev/null
@@ -1,65 +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 0.10 New and Noteworthy - History View Enhancements</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">History View Enhancements</th>
- </tr>
- <tr>
- <td style="width: 20%" align="left">
- <a href="Repositories-View-Improvements.html" title="Repositories View 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="Auto-wrapping-Commit-Messages.html" title="Auto-wrapping Commit Messages">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">Repositories View Improvements</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Auto-wrapping Commit Messages</td>
- </tr>
- </table><hr/>
- <h1 id="History_View_Enhancements">History View Enhancements</h1>
- <p>The History View coding has been cleaned up, this yields some performance improvements.
-
- <br/>Also some menu actions have been added on the commit list's context menu.
- </p>
- <p>
- <img border="0" src="images/Egit-0.10-history-commitmenu.png"/>
- </p><hr/>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <td style="width: 20%" align="left">
- <a href="Repositories-View-Improvements.html" title="Repositories View Improvements">
- <img alt="Previous" border="0" src="../../../images/prev.gif"/>
- </a>
- </td>
- <td style="width: 60%" align="center">
- <a href="0.10.html" title="EGit 0.10 New and Noteworthy">
- <img alt="EGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/>
- </a>
- </td>
- <td style="width: 20%" align="right">
- <a href="Auto-wrapping-Commit-Messages.html" title="Auto-wrapping Commit Messages">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">Repositories View Improvements</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Auto-wrapping Commit Messages</td>
- </tr>
- </table>
- </body>
-</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Merge-Tool.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Merge-Tool.html
deleted file mode 100644
index a44a6b33f..000000000
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Merge-Tool.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 0.10 New and Noteworthy - Merge Tool</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">Merge Tool</th>
- </tr>
- <tr>
- <td style="width: 20%" align="left">
- <a href="Cherry-pick-Support.html" title="Cherry-pick Support">
- <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="Synchronize-View-Local-Changes-in-Changeset-Mode.html" title="Synchronize View - Local Changes in Changeset Mode">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">Cherry-pick Support</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Synchronize View - Local Changes in Changeset Mode</td>
- </tr>
- </table><hr/>
- <h1 id="Merge_Tool">Merge Tool</h1>
- <p>EGit now supports a
- <a href="../../../EGit/User_Guide/Tasks.html#Using_Merge_Tool" title="EGit/User_Guide#Using_Merge_Tool">visual merge tool</a> to better support resolving conflicts detected during merge, rebase or cherry-pick
- </p>
- <p>
- <img border="0" src="images/Egit-0.10-merge-tool.png"/>
- </p><hr/>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <td style="width: 20%" align="left">
- <a href="Cherry-pick-Support.html" title="Cherry-pick Support">
- <img alt="Previous" border="0" src="../../../images/prev.gif"/>
- </a>
- </td>
- <td style="width: 60%" align="center">
- <a href="0.10.html" title="EGit 0.10 New and Noteworthy">
- <img alt="EGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/>
- </a>
- </td>
- <td style="width: 20%" align="right">
- <a href="Synchronize-View-Local-Changes-in-Changeset-Mode.html" title="Synchronize View - Local Changes in Changeset Mode">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">Cherry-pick Support</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Synchronize View - Local Changes in Changeset Mode</td>
- </tr>
- </table>
- </body>
-</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/PDE-Build-Fetch-Factory.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/PDE-Build-Fetch-Factory.html
deleted file mode 100644
index 3f473d373..000000000
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/PDE-Build-Fetch-Factory.html
+++ /dev/null
@@ -1,61 +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 0.10 New and Noteworthy - PDE Build Fetch Factory</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">PDE Build Fetch Factory</th>
- </tr>
- <tr>
- <td style="width: 20%" align="left">
- <a href="Auto-wrapping-Commit-Messages.html" title="Auto-wrapping Commit Messages">
- <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="Bugs-Closed.html" title="Bugs Closed">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">Auto-wrapping Commit Messages</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Bugs Closed</td>
- </tr>
- </table><hr/>
- <h1 id="PDE_Build_Fetch_Factory">PDE Build Fetch Factory</h1>
- <p>In the
- <b>org.eclipse.egit.fetchfactory</b> plug-in TODO
- </p><hr/>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <td style="width: 20%" align="left">
- <a href="Auto-wrapping-Commit-Messages.html" title="Auto-wrapping Commit Messages">
- <img alt="Previous" border="0" src="../../../images/prev.gif"/>
- </a>
- </td>
- <td style="width: 60%" align="center">
- <a href="0.10.html" title="EGit 0.10 New and Noteworthy">
- <img alt="EGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/>
- </a>
- </td>
- <td style="width: 20%" align="right">
- <a href="Bugs-Closed.html" title="Bugs Closed">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">Auto-wrapping Commit Messages</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Bugs Closed</td>
- </tr>
- </table>
- </body>
-</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Rebase-Support.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Rebase-Support.html
deleted file mode 100644
index e143367fc..000000000
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Rebase-Support.html
+++ /dev/null
@@ -1,68 +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 0.10 New and Noteworthy - Rebase Support</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">Rebase Support</th>
- </tr>
- <tr>
- <td style="width: 20%" align="left">
- <a href="0.10.html" title="EGit 0.10 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="Cherry-pick-Support.html" title="Cherry-pick Support">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">EGit 0.10 New and Noteworthy</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Cherry-pick Support</td>
- </tr>
- </table><hr/>
- <h1 id="Rebase_Support">Rebase Support</h1>
- <p>EGit now supports
- <a href="../../../EGit/User_Guide/Tasks.html#Rebasing" title="EGit/User_Guide#Rebasing">Rebase</a> with options to abort, skip, and continue when rebase finds conflicts .
- </p>
- <p>
- <img border="0" src="images/EGit-0.10-StartRebaseFromRepoView.png"/>
- </p>
- <p>When conflicts are detected during rebase the following dialog presents the options how to proceed</p>
- <p>
- <img border="0" src="images/EGit-0.10-RebaseConflictDialog.png"/>
- </p><hr/>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <td style="width: 20%" align="left">
- <a href="0.10.html" title="EGit 0.10 New and Noteworthy">
- <img alt="Previous" border="0" src="../../../images/prev.gif"/>
- </a>
- </td>
- <td style="width: 60%" align="center">
- <a href="0.10.html" title="EGit 0.10 New and Noteworthy">
- <img alt="EGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/>
- </a>
- </td>
- <td style="width: 20%" align="right">
- <a href="Cherry-pick-Support.html" title="Cherry-pick Support">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">EGit 0.10 New and Noteworthy</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Cherry-pick Support</td>
- </tr>
- </table>
- </body>
-</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Repositories-View-Improvements.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Repositories-View-Improvements.html
deleted file mode 100644
index 7391d8775..000000000
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Repositories-View-Improvements.html
+++ /dev/null
@@ -1,65 +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 0.10 New and Noteworthy - Repositories View 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">Repositories View Improvements</th>
- </tr>
- <tr>
- <td style="width: 20%" align="left">
- <a href="HTTP-Authentication.html" title="HTTP Authentication">
- <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="History-View-Enhancements.html" title="History View Enhancements">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">HTTP Authentication</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">History View Enhancements</td>
- </tr>
- </table><hr/>
- <h1 id="Repositories_View_Improvements">Repositories View Improvements</h1>
- <h2 id="Drag_and_Drop_Support">Drag and Drop Support</h2>
- <p>The repositories view now supports drag and drop. You can drag a folder or a list of folders from the file system into the Repositories View. If the folders are a valid Git repository or a direct parent of a .git folder, they will be added as a repository to the view.</p>
- <h2 id="Support_for_References">Support for References</h2>
- <p>The Repositories View now displays References like HEAD, FETCH_HEAD and provides corresponding checkout and create branch menu actions.
-
- <img border="0" src="images/Egit-0.10-repoview-refsupport.png"/>
- </p><hr/>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <td style="width: 20%" align="left">
- <a href="HTTP-Authentication.html" title="HTTP Authentication">
- <img alt="Previous" border="0" src="../../../images/prev.gif"/>
- </a>
- </td>
- <td style="width: 60%" align="center">
- <a href="0.10.html" title="EGit 0.10 New and Noteworthy">
- <img alt="EGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/>
- </a>
- </td>
- <td style="width: 20%" align="right">
- <a href="History-View-Enhancements.html" title="History View Enhancements">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">HTTP Authentication</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">History View Enhancements</td>
- </tr>
- </table>
- </body>
-</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Synchronize-View-Local-Changes-in-Changeset-Mode.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Synchronize-View-Local-Changes-in-Changeset-Mode.html
deleted file mode 100644
index bc1c46b3a..000000000
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Synchronize-View-Local-Changes-in-Changeset-Mode.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 0.10 New and Noteworthy - Synchronize View - Local Changes in Changeset Mode</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">Synchronize View - Local Changes in Changeset Mode</th>
- </tr>
- <tr>
- <td style="width: 20%" align="left">
- <a href="Merge-Tool.html" title="Merge Tool">
- <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="HTTP-Authentication.html" title="HTTP Authentication">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">Merge Tool</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">HTTP Authentication</td>
- </tr>
- </table><hr/>
- <h1 id="Synchronize_View_-_Local_Changes_in_Changeset_Mode">Synchronize View - Local Changes in Changeset Mode</h1>
- <p>EGit now shows current working tree and index status in changeset mode.</p>
- <p>
- <img border="0" src="images/EGit-0.10-working-tree-and-staged-changes-in-changeset.png"/>
- </p>
- <p>Those two nodes will only appear when "Include local uncommited changes in comparison" option was selected in synchronization dialog and when there are any staged or locally made changes.</p><hr/>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <td style="width: 20%" align="left">
- <a href="Merge-Tool.html" title="Merge Tool">
- <img alt="Previous" border="0" src="../../../images/prev.gif"/>
- </a>
- </td>
- <td style="width: 60%" align="center">
- <a href="0.10.html" title="EGit 0.10 New and Noteworthy">
- <img alt="EGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/>
- </a>
- </td>
- <td style="width: 20%" align="right">
- <a href="HTTP-Authentication.html" title="HTTP Authentication">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">Merge Tool</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">HTTP Authentication</td>
- </tr>
- </table>
- </body>
-</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/CherryPick1.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/CherryPick1.png
deleted file mode 100644
index 0c25e444f..000000000
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/CherryPick1.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/EGit-0.10-RebaseConflictDialog.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/EGit-0.10-RebaseConflictDialog.png
deleted file mode 100644
index 410497b65..000000000
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/EGit-0.10-RebaseConflictDialog.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/EGit-0.10-StartRebaseFromRepoView.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/EGit-0.10-StartRebaseFromRepoView.png
deleted file mode 100644
index fd4b9b644..000000000
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/EGit-0.10-StartRebaseFromRepoView.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/EGit-0.10-working-tree-and-staged-changes-in-changeset.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/EGit-0.10-working-tree-and-staged-changes-in-changeset.png
deleted file mode 100644
index 3c8326018..000000000
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/EGit-0.10-working-tree-and-staged-changes-in-changeset.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/Egit-0.10-history-commitmenu.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/Egit-0.10-history-commitmenu.png
deleted file mode 100644
index 9bc97cc21..000000000
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/Egit-0.10-history-commitmenu.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/Egit-0.10-merge-tool.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/Egit-0.10-merge-tool.png
deleted file mode 100644
index c2ec28171..000000000
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/Egit-0.10-merge-tool.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/Egit-0.10-repoview-refsupport.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/Egit-0.10-repoview-refsupport.png
deleted file mode 100644
index a7228b701..000000000
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/images/Egit-0.10-repoview-refsupport.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/0.11.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/0.11.html
new file mode 100644
index 000000000..19097c665
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/0.11.html
@@ -0,0 +1,119 @@
+<?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 0.11 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 0.11 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="Bugs-Closed.html" title="Bugs Closed">
+ <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">Bugs Closed</td>
+ </tr>
+ </table><hr/>
+ <h1 id="Feature">Feature</h1>
+ <h2 id="Fetch_Change_from_Gerrit">Fetch Change from Gerrit</h2>
+ <p>
+ <img border="0" src="images/Egit-0.11-fetchChangeFromGerritDialog.png"/>
+ </p>
+ <p>A new wizard provides convenient fetching of changes from Gerrit</p>
+ <h2 id="Actions_for_Push_and_Fetch_using_upstream_configuration">Actions for Push and Fetch using upstream configuration</h2>
+ <p>A couple of new actions (
+ <b>Team &gt; Push to Upstream</b> and
+ <b>Team &gt; Fetch from Upstream</b>) allows to directly push to and fetch from the remote stored in the upstream configuration of the currently checked out branch without the need to go through a wizard each time.
+ </p>
+ <p>
+ <img border="0" src="images/Egit-0.11-project-menu.png"/>
+ </p>
+ <h2 id="Simplified_Wizards_for_Configuration_of_Fetch_and_Push">Simplified Wizards for Configuration of Fetch and Push</h2>
+ <p>Simplified Fetch and Push Wizards were implemented which also behave much closer to fetch and push in c git.</p>
+ <p>
+ <img border="0" src="images/Egit-0.11-ConfigureFetchFromUpstream.png"/>
+ </p>
+ <p>
+ <img border="0" src="images/Egit-0.11-ConfigurePushToUpstream.png"/>
+ </p>
+ <h2 id="History_View">History View</h2>
+ <p>
+ <img border="0" src="images/Egit-0.11-history-actions.png"/>
+ </p>
+ <ul>
+ <li>Merge and Rebase can now be triggered from the History View</li>
+ <li>A Revert action was implemented in the History View</li>
+ <li>The commit message pane in the history view now shows links to navigate to next Tags / Branches reachable from the selected commit</li>
+ <li>
+ <b>Open Corresponding Task'' and '''Add to Task Context</b> actions provide integration with Mylyn's task handling
+ </li>
+ </ul>
+ <h2 id="Compare">Compare</h2>
+ <ul>
+ <li>Comparison of trees was added so that
+ <b>Compare with...</b> actions now also work on folders and projects.
+ </li>
+ </ul>
+ <p>
+ <img border="0" src="images/Egit-0.11-GitTreeCompareView.png"/>
+ </p>
+ <ul>
+ <li>
+ <b>Compare with Commit...</b> was added
+ </li>
+ <li>
+ <b>Compare with Branch or Tag...</b> was added
+ </li>
+ </ul>
+ <p>
+ <img border="0" src="images/Egit-0.11-CompareWithMenu.png"/>
+ </p>
+ <h2 id="EGit_Mylyn_Integration:_Commit_Dialog">EGit Mylyn Integration: Commit Dialog</h2>
+ <p>The commit dialog is now integrated with Mylyn to populate it with active task information.</p>
+ <p>
+ <img border="0" src="images/Egit-mylyn.png"/>
+ </p>
+ <h2 id="EGit_Mylyn_Integration:_History_View">EGit Mylyn Integration: History View</h2>
+ <p>The history view is integrated with Mylyn via the
+ <b>Add to Task Context</b> or
+ <b>Open Corresponding Task</b> actions
+ </p>
+ <p>
+ <img border="0" src="images/Egit-mylyn-historyview.png"/>
+ </p>
+ <h2 id="Performance_Improvements">Performance Improvements</h2>
+ <p>The following operations are now much faster:</p>
+ <ul>
+ <li>synchronize</li>
+ <li>decoration of Eclipse resources</li>
+ <li>opening commit dialog</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="Bugs-Closed.html" title="Bugs Closed">
+ <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">Bugs Closed</td>
+ </tr>
+ </table>
+ </body>
+</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Bugs-Closed.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/Bugs-Closed.html
index 82dd1195b..f4a6b0766 100644
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Bugs-Closed.html
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/Bugs-Closed.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 0.10 New and Noteworthy - Bugs Closed</title>
+ <title>EGit 0.11 New and Noteworthy - Bugs Closed</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="PDE-Build-Fetch-Factory.html" title="PDE Build Fetch Factory">
+ <a href="0.11.html" title="EGit 0.11 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">PDE Build Fetch Factory</td>
+ <td style="width: 20%" align="left" valign="top">EGit 0.11 New and Noteworthy</td>
<td style="width: 60%" align="center"></td>
<td style="width: 20%" align="right" valign="top">Commits</td>
</tr>
</table><hr/>
<h1 id="Bugs_Closed">Bugs Closed</h1>
<p>
- <a href="https://bugs.eclipse.org/bugs/buglist.cgi?chfieldto=2010-12-15;query_format=advanced;chfield=bug_status;chfieldfrom=2010-09-23;bug_status=RESOLVED;bug_status=CLOSED;resolution=FIXED;classification=Technology;product=EGit" target="egit_external">74 EGit Bugs</a> have been closed since 0.9
+ <a href="https://bugs.eclipse.org/bugs/buglist.cgi?chfieldto=2011-02-10;query_format=advanced;chfield=bug_status;chfieldfrom=2010-12-18;chfieldvalue=resolved;resolution=FIXED;resolution=DUPLICATE;product=EGit;classification=Technology" target="egit_external">43 bugs and 11 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="PDE-Build-Fetch-Factory.html" title="PDE Build Fetch Factory">
+ <a href="0.11.html" title="EGit 0.11 New and Noteworthy">
<img alt="Previous" border="0" src="../../../images/prev.gif"/>
</a>
</td>
<td style="width: 60%" align="center">
- <a href="0.10.html" title="EGit 0.10 New and Noteworthy">
- <img alt="EGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ <a href="0.11.html" title="EGit 0.11 New and Noteworthy">
+ <img alt="EGit 0.11 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">PDE Build Fetch Factory</td>
+ <td style="width: 20%" align="left" valign="top">EGit 0.11 New and Noteworthy</td>
<td style="width: 60%" align="center"></td>
<td style="width: 20%" align="right" valign="top">Commits</td>
</tr>
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Commits.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/Commits.html
index 3da54babc..c70e23a45 100644
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Commits.html
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/Commits.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 0.10 New and Noteworthy - Commits</title>
+ <title>EGit 0.11 New and Noteworthy - Commits</title>
<link type="text/css" rel="stylesheet" href="../../../book.css"/>
</head>
<body>
@@ -31,7 +31,7 @@
</table><hr/>
<h1 id="Commits">Commits</h1>
<p>
- <a href="http://egit.eclipse.org/w/?p=egit.git;a=shortlog;h=stable-0.10;hp=v0.9.3;opt=--no-merges" target="egit_external">EGit 0.10 - commits in gitweb</a>
+ <a href="http://egit.eclipse.org/w/?p=egit.git;a=shortlog;h=stable-0.11;hp=v0.10.1;opt=--no-merges" target="egit_external">EGit 0.11 - commits in gitweb</a>
</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="0.10.html" title="EGit 0.10 New and Noteworthy">
- <img alt="EGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ <a href="0.11.html" title="EGit 0.11 New and Noteworthy">
+ <img alt="EGit 0.11 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/0.10/Updating-This-Document.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/Updating-This-Document.html
index db74b001b..85b98dc94 100644
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Updating-This-Document.html
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/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 0.10 New and Noteworthy - Updating This Document</title>
+ <title>EGit 0.11 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/0.10" target="egit_external">http://wiki.eclipse.org/EGit/New_and_Noteworthy/0.10</a>
+ <a href="http://wiki.eclipse.org/EGit/New_and_Noteworthy/0.11" target="egit_external">http://wiki.eclipse.org/EGit/New_and_Noteworthy/0.11</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="0.10.html" title="EGit 0.10 New and Noteworthy">
- <img alt="EGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ <a href="0.11.html" title="EGit 0.11 New and Noteworthy">
+ <img alt="EGit 0.11 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/0.11/images/Egit-0.11-CompareWithMenu.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/images/Egit-0.11-CompareWithMenu.png
new file mode 100644
index 000000000..ad353f8c3
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/images/Egit-0.11-CompareWithMenu.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/images/Egit-0.11-ConfigureFetchFromUpstream.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/images/Egit-0.11-ConfigureFetchFromUpstream.png
new file mode 100644
index 000000000..0460d2da9
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/images/Egit-0.11-ConfigureFetchFromUpstream.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/images/Egit-0.11-ConfigurePushToUpstream.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/images/Egit-0.11-ConfigurePushToUpstream.png
new file mode 100644
index 000000000..f6767b547
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/images/Egit-0.11-ConfigurePushToUpstream.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/images/Egit-0.11-GitTreeCompareView.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/images/Egit-0.11-GitTreeCompareView.png
new file mode 100644
index 000000000..d4f877ff1
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/images/Egit-0.11-GitTreeCompareView.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/images/Egit-0.11-fetchChangeFromGerritDialog.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/images/Egit-0.11-fetchChangeFromGerritDialog.png
new file mode 100644
index 000000000..d0d9e2c92
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/images/Egit-0.11-fetchChangeFromGerritDialog.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/images/Egit-0.11-history-actions.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/images/Egit-0.11-history-actions.png
new file mode 100644
index 000000000..a14461aa9
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/images/Egit-0.11-history-actions.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/images/Egit-0.11-project-menu.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/images/Egit-0.11-project-menu.png
new file mode 100644
index 000000000..00a179b3f
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/images/Egit-0.11-project-menu.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/images/Egit-mylyn-historyview.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/images/Egit-mylyn-historyview.png
new file mode 100644
index 000000000..7e85cfa0a
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/images/Egit-mylyn-historyview.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/images/Egit-mylyn.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/images/Egit-mylyn.png
new file mode 100644
index 000000000..b02a6da30
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.11/images/Egit-mylyn.png
Binary files differ
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 dc9a64d76..cf616e907 100644
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/Reference.html
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/Reference.html
@@ -36,7 +36,7 @@
Git actions are available for projects shared with the Git team provider:
<br/>
- <img border="0" src="images/Egit-0.10-project-menu.png"/>
+ <img border="0" src="images/Egit-0.11-project-menu.png"/>
</p>
<h3 id="Resource_Context_Menu">Resource Context Menu</h3>
<p>On resource nodes (files and folders) in navigation views the following Git actions are available for projects shared with the Git team provider:
@@ -53,9 +53,9 @@
<p>Menu on repository nodes:
<br/>
- <img border="0" src="images/Egit-0.10-repoview-repomenu.png"/>
+ <img border="0" src="images/Egit-0.11-repoview-repomenu.png"/>
</p>
- <p>Menu on branche nodes:
+ <p>Menu on branch nodes:
<br/>
<img border="0" src="images/Egit-0.10-repoview-branchmenu.png"/>
@@ -91,115 +91,160 @@
<img border="0" src="images/Egit-0.10-history-commitmenu.png"/>
</p>
+ <h3 id="Git_Workbench_Toolbar_and_Git_Workbench_Menu">Git Workbench Toolbar and Git Workbench Menu</h3>
+ <p>In order to ease use of the most frequently used Git actions the
+ <b>Git Command Group</b> can be activated to show a Git Workbench Toolbar and/or Menu
+ </p>
+ <ul>
+ <li>right-click in the workbench toolbar area and click
+ <b>Customize perspective...</b>
+ </li>
+ <li>in the tab
+ <b>Command Groups Availability</b> click
+ <b>Git</b>, this will enable both the Git workbench toolbar and menu
+ </li>
+ <li>in the tabs
+ <b>Toolbar Visibility</b> and
+ <b>Menu Visibility</b> you may configure which actions should appear in the Git Workbench toolbar and menu
+ </li>
+ </ul>
+ <p>
+ <img border="0" src="images/Egit-0.11-workbench-toolbar.png"/>
+
+ <br/>
+ <br/>
+ </p>
+ <p>
+ <img border="0" src="images/Egit-0.11-workbench-menu.png"/>
+
+ <br/>
+ <br/>
+ </p>
<h3 id="Menu_Actions">Menu Actions</h3>
<ul>
<li>
- <a href="User-Guide.html#Track_Changes">Add</a> -
+ <a href="User-Guide.html#Track_Changes">Add</a>
<ul>
<li>Add changes present in the working tree to the git index, also known as staging changes. </li>
- <li>Put newly created resources under git version control (Git does not automatically start tracking resources).</li>
+ <li>Put newly created resources under git version control (Git does not automatically start tracking resources). </li>
<li>
- <a href="Tasks.html#Adding_conflict_resolution_to_the_git_index">Resolve conflicts</a>.
+ <a href="Tasks.html#Adding_conflict_resolution_to_the_git_index">Resolve conflicts</a>.
</li>
</ul>
</li>
<li>
- <a href="Tasks.html#Applying_Patches">Apply Patch</a> - Apply a patch.
+ <a href="Tasks.html#Applying_Patches">Apply Patch</a> - Apply a patch.
</li>
<li>
<b>Assume unchanged</b> - Resources can be flagged "assume unchanged". This means that Git stops checking the working tree files for possible modifications, so you need to manually unset the bit to tell Git when you change the working tree file. This setting can be switched on with the menu action
<b>Team &gt; Assume unchanged</b> and switched back with the menu action
- <b>Team &gt; No Assume unchanged</b>.
+ <b>Team &gt; No Assume unchanged</b>.
</li>
<li>
<a href="Tasks.html#Branching">Branch</a>,
- <a href="Reference.html#Create_Branch...">Create Branch</a> - Checkout a branch or create a branch.
+ <a href="Reference.html#Create_Branch...">Create Branch</a> - Checkout a branch or create a branch.
</li>
<li>
- <b>Change Credentials</b> - Change logon credentials of a Fetch or Push Specification, credentials are stored per URL in the Eclipse Secure Store.
+ <b>Change Credentials</b> - Change logon credentials of a Fetch or Push Specification, credentials are stored per URL in the Eclipse Secure Store.
</li>
<li>
<b>Checkout</b> - Checkout a
<a href="Tasks.html#Check-out_of_Branches_and_Tags">Branch, Tag</a>,
- <a href="Reference.html#Checkout">Commit</a> or Reference.
+ <a href="Reference.html#Checkout">Commit</a> or Reference.
+ </li>
+ <li>
+ <a href="Tasks.html#Cherry_Picking">Cherry-pick</a> - Cherry-pick a single commit onto the tip of the currently checked out branch.
+ </li>
+ <li>
+ <b>Clear Credentials</b> - Clear logon credentials of a Fetch or Push Specification, credentials are stored per URL in the Eclipse Secure Store.
+ </li>
+ <li>
+ <a href="Tasks.html#Committing_Changes">Commit</a> - Commit changes.
</li>
<li>
- <a href="Tasks.html#Cherry_Picking">Cherry-pick</a> - Cherry-pick a single commit onto the tip of the currently checked out branch.
+ <b>Delete Fetch</b> - Delete a Fetch Specification.
</li>
<li>
- <b>Clear Credentials</b> - Clear logon credentials of a Fetch or Push Specification, credentials are stored per URL in the Eclipse Secure Store.
+ <b>Delete Push</b> - Delete a Push Specification.
</li>
<li>
- <a href="Tasks.html#Committing_Changes">Commit</a> - Commit changes.
+ <a href="Tasks.html#Direct_Fetch_and_Push_Support">Configure Fetch</a> - Configure a Fetch Specification.
</li>
<li>
- <b>Delete Fetch</b> - Delete a Fetch Specification.
+ <a href="Tasks.html#Direct_Fetch_and_Push_Support">Configure Push</a> - Configure a Push Specification.
</li>
<li>
- <b>Delete Push</b> - Delete a Push Specification.
+ <a href="Tasks.html#Creation_and_Deletion_of_Branches">Delete Branch</a> - Delete a branch.
</li>
<li>
- <a href="Tasks.html#Direct_Fetch_and_Push_Support">Configure Fetch</a> - Configure a Fetch Specification.
+ <a href="Tasks.html#Deleting_a_Repository">Delete Repository</a> - Delete a repository.
</li>
<li>
- <a href="Tasks.html#Direct_Fetch_and_Push_Support">Configure Push</a> - Configure a Push Specification.
+ <b>Disconnect</b> - Disconnect the attached Git Team Provider from this project. The git repository still exists but is no longer integrated with Eclipse.
</li>
<li>
- <a href="Tasks.html#Creation_and_Deletion_of_Branches">Delete Branch</a> - Delete a branch.
+ <a href="Reference.html#Git_Ignore">Ignore</a> - Add files to .gitignore so that git ignores them.
</li>
<li>
- <a href="Tasks.html#Deleting_a_Repository">Delete Repository</a> - Delete a repository.
+ <a href="#Method_for_importing_Projects">Import Projects</a> - Import projects into the Eclipse workbench.
</li>
<li>
- <b>Disconnect</b> - Disconnect the attached Git Team Provider from this project. The git repository still exists but is no longer integrated with Eclipse.
+ <a href="Tasks.html#Merging">Merge</a> - Merge branches.
</li>
<li>
- <a href="Tasks.html#Fetching_from_other_Repositories">Fetch From</a> - Fetch changes from remote repositories.
+ <a href="Tasks.html#Using_Merge_Tool">Merge Tool</a> - Resolve conflicts using the Merge Tool.
</li>
<li>
- <a href="Reference.html#Git_Ignore">Ignore</a> - Add files to .gitignore so that git ignores them.
+ <a href="Tasks.html#Repository_Configuration">Open Properties View</a> - View and edit the repository configuration.
</li>
<li>
- <a href="Tasks.html#Method_for_importing_Projects">Import Projects</a> - Import projects into the Eclipse workbench.
+ <a href="#Pulling_New_Changes_from_Upstream_Repositories">Pull</a> - Pull changes from remote branch tracked by currently checked out local branch.
</li>
<li>
- <a href="Tasks.html#Merging">Merge</a> - Merge branches.
+ <i>'Remote &gt; '</i>
+ <a href="Tasks.html#Fetching_from_other_Repositories">Fetch From</a> - Fetch changes from a remote repository
</li>
<li>
- <a href="Tasks.html#Using_Merge_Tool">Merge Tool</a> - Resolve conflicts using the Merge Tool.
+ <b>Remote &gt;</b>
+ <a href="Tasks.html#Fetching_a_change_from_a_Gerrit_Code_Review_Server">Fetch from Gerrit</a> - Fetch changed from a Gerrit Code Review Server
</li>
<li>
- <a href="Tasks.html#Repository_Configuration">Open Properties View</a> - View and edit the repository configuration.
+ <b>Remote &gt;</b>
+ <a href="Tasks.html#Pushing_to_other_Repositories">Push</a> - Push changes to other repositories
+ <br/>
</li>
<li>
- <a href="Tasks.html#Pulling_New_Changes_from_Upstream_Repositories">Pull</a> - Pull changes from remote branch tracked by currently checked out local branch.
+ <b>Remote &gt;</b>
+ <a href="Tasks.html#Configuring_upstream_fetch">Configure Fetch from Upstream</a> - Configure Upstream for automated fetch
</li>
<li>
- <a href="Tasks.html#Pushing_to_other_Repositories">Push</a> - Push changes to another repository.
+ <b>Remote &gt;</b>
+ <a href="Tasks.html#Configuring_upstream_push">Configure Push to Upstream</a> - Configure upstream for automated push
+ <br/>
</li>
<li>
- <a href="Tasks.html#Rebasing">Rebase</a> - Rebase a branch onto another one.
+ <a href="Tasks.html#Rebasing">Rebase</a> - Rebase a branch onto another one.
</li>
<li>
- <a href="Tasks.html#Removing_a_Repository_from_the_Repositories_View">Remove Repository</a> - Remove a repository from the Repositories View.
+ <a href="Tasks.html#Removing_a_Repository_from_the_Repositories_View">Remove Repository</a> - Remove a repository from the Repositories View.
</li>
<li>
- <a href="Tasks.html#Renaming_an_Existing_Branch">Rename Branch</a> - Rename a branch.
+ <a href="Tasks.html#Renaming_an_Existing_Branch">Rename Branch</a> - Rename a branch.
</li>
<li>
- <a href="Tasks.html#Resetting_your_current_HEAD">Reset</a> - Reset the current HEAD, Index or Working Tree.
+ <a href="Tasks.html#Resetting_your_current_HEAD">Reset</a> - Reset the current HEAD, Index or Working Tree.
</li>
<li>
- <a href="Reference.html#History_View">Show in History</a> - Show the selected resource in the History View.
+ <a href="Reference.html#History_View">Show in History</a> - Show the selected resource in the History View.
</li>
<li>
- <a href="Tasks.html#Managing_Repositories">Show in Repositories View</a> - Show the selected resource in the Repositories View.
+ <a href="Tasks.html#Managing_Repositories">Show in Repositories View</a> - Show the selected resource in the Repositories View.
</li>
<li>
- <a href="Tasks.html#Comparing_with_Branches_.28Synchronize.29">Synchronize</a> - Synchronize local and remote branches with each other.
+ <a href="Tasks.html#Comparing_with_Branches_.28Synchronize.29">Synchronize</a> - Synchronize local and remote branches with each other.
</li>
<li>
- <a href="Tasks.html#Tagging">Tag</a> - Create, delete tags.
+ <a href="Tasks.html#Tagging">Tag</a> - Create, delete tags.
</li>
<li>
<b>Untrack</b> - Remove resources from git version control. If you want to delete the resource from the working tree click also
@@ -304,15 +349,16 @@
<b>Compare with working tree</b> will be executed, otherwise
<b>Open</b>.
</p>
- <p>It is possible to compare the file contents of two commits by selecting the two commits and right-clicking on
- <b>Compare with Each Other</b>.
+ <p>It is possible to compare the contents of two commits filtered by the current input by selecting the two commits and right-clicking on
+ <b>Compare with each other</b>. If the current input is not a file, there is an additional menu action
+ <b>Compare with each other in Tree</b>. The first action opens an Eclipse compare editor, the second opens the
+ <a href="Reference.html#Git_Tree_Compare_View">Git Tree Compare View</a>.
</p>
<p>Furthermore, it is possible to select any number of commits and right-click
<b>Open</b> to see all versions of the file corresponding to the selected commits (one editor will be opened per version).
</p>
<p>If the current input is not a file, then there won't be menu actions for
- <b>Open</b> and
- <b>Compare</b>. However, it is possible to double-click on an entry the Revision Detail area. If compare mode is active, a compare editor will be openend showing the changes for the file being double-clicked in the currently selected commit (i.e. a diff of the file content in the currently selected commit against the file content of this commit's ancestor). If compare mode is not active, an editor with the file content corresponding to the currently selected commit is shown.
+ <b>Open</b>. However, it is possible to double-click on an entry the Revision Detail area. If compare mode is active, a compare editor will be openend showing the changes for the file being double-clicked in the currently selected commit (i.e. a diff of the file content in the currently selected commit against the file content of this commit's ancestor). If compare mode is not active, an editor with the file content corresponding to the currently selected commit is shown.
</p>
<p>
<img border="0" src="images/Egit-0.9-history-view-openAndCompareFromDetails.png"/>
@@ -403,12 +449,20 @@
<p>Creates a tag on the currently selected commit. A dialog will be shown asking for a tag name and a tag message.</p>
<h5 id="Create_Patch...">Create Patch...</h5>
<p>This action is not available on the very first commit of a Repository. It will create a patch containing the changes of the currently selected commit compared to that commit's predecessor. A dialog will be shown asking whether the patch should be created as file or in the clipboard and whether to use the Git patch format of the generic patch format.</p>
+ <h5 id="Cherry_Pick">Cherry Pick</h5>
+ <p>Applies the change introduced by the selected commit on top of the currently checked out commit.</p>
+ <h5 id="Revert_Commit">Revert Commit</h5>
+ <p>Reverts the changes that the selected commit introduces by creating a new commit on top of the currently checked out commit.</p>
+ <h5 id="Merge">Merge</h5>
+ <p>Merges the selected commit into the currently checked out branch.</p>
+ <h5 id="Rebase_on_top_of">Rebase on top of</h5>
+ <p>Rebases the currently checked out branch on top of the selected commit.</p>
<h5 id="Reset_.3E_Soft.2FMixed.2FHard">Reset &gt; Soft/Mixed/Hard</h5>
<p>This action resets the Repository containing the current input to the currently selected commit. Depending on the choice of the sub-menu, a soft, mixed, or hard reset will be performed.</p>
<h5 id="Quickdiff_.3E_Reset_Quickdiff_Basline_to_HEAD">Quickdiff &gt; Reset Quickdiff Basline to HEAD</h5>
<h5 id="Quickdiff_.3E_Reset_Quickdiff_Basline_to_first_parent_of_HEAD">Quickdiff &gt; Reset Quickdiff Basline to first parent of HEAD</h5>
<p>These two actions set the quickdiff basline for the repository to HEAD or to the parent of HEAD. These actions are always available, even if more than one commit is selected.</p>
- <h5 id="Quickdiff_.3E_Set_as_Baseline_.3D">Quickdiff &gt; Set as Baseline =</h5>
+ <h5 id="Quickdiff_.3E_Set_as_Baseline">Quickdiff &gt; Set as Baseline</h5>
<p>This action is only available if a single commit is selected; it will st the quickdiff baseline for the repository to the selected commit.</p>
<h5 id="Copy">Copy</h5>
<p>Copies the IDs of the currently selected commit or commits into the clipboard.</p>
@@ -524,6 +578,20 @@
<p>
<br/>
</p>
+ <h3 id="Git_Tree_Compare_View">Git Tree Compare View</h3>
+ <p>This view will be opened by some of the
+ <b>Compare With</b> actions (see
+ <a href="Tasks.html#Comparing_Content">Comparing Content</a>). When started from a resource (e.g. a project or folder), it will look similar to the resources in the workspace. However, the usual icons on the files will be replaced with icons showing the change state (added, deleted, changed, or unchanged).
+ </p>
+ <p>The changes can be browsed and a double-click on a file will open a compare editor for this file (this only makes sense on "changed" files, in case of added or deleted files, one side of the compare editor will be empty, whereas unchanged files will show the same content on both sides of the editor): </p>
+ <p>
+ <img border="0" src="images/Egit-0.11-GitTreeCompareView.png"/>
+ </p>
+ <p>It is possible to hide unchanged files by clicking the "Hide files with equal content" button in the toolbar.</p>
+ <p>The Git Tree Compare View can also be started without having workspace resources as starting point (for example by comparing two commits in the history view when the input of the history view is a Repository and not a workspace resource). In this case, the complete content of the Repository is shown and both projects and folders appear as simple "folder" icons:</p>
+ <p>
+ <img border="0" src="images/Egit-0.11-GitTreeCompareViewRepo.png"/>
+ </p>
<h2 id="Git_URLs">Git URLs</h2>
<p>Git URLs in general consist of transport protocol scheme, address of the remote server and the repository path within the remote server and for some authenticating protocols also the user ID.</p>
<p>EGit supports the following protocols</p>
@@ -576,29 +644,50 @@
<h2 id="Git_References">Git References</h2>
<p>Git References are also known shortly as
<b>Refs</b>.
-
<br/>They comprise
</p>
<ul>
<li>branches </li>
<li>remote-tracking branches </li>
- <li>tags </li>
+ <li>tags</li>
</ul>
<p>They all are named with a path using '/' as path separator and are starting with "refs". </p>
<ul>
- <li>Local branches start with "refs/heads/"</li>
- <li>Remote tracking branches start with "refs/remotes/". Remote tracking branches proxy branches located in a remote repository so that their state at the time of the last transport operation can be queried also when no connection to the repository is available (offline).</li>
+ <li>Local branches start with "refs/heads/" </li>
+ <li>Remote tracking branches start with "refs/remotes/". Remote tracking branches proxy branches located in a remote repository so that their state at the time of the last transport operation can be queried also when no connection to the repository is available (offline). </li>
<li>Tags start with "refs/tags/"</li>
</ul>
<p>Ref names can be abbreviated as long as the abbreviated form is unique.
-
- <br/>E.g.
+ <br/>E.g.
</p>
<ul>
- <li>"master" is short for "refs/heads/master"</li>
- <li>"origin/master" is short for "refs/remotes/origin/master"</li>
+ <li>"master" is short for "refs/heads/master" </li>
+ <li>"origin/master" is short for "refs/remotes/origin/master" </li>
<li>"v1.0.1" is short for "refs/tags/v1.0.1"</li>
</ul>
+ <p>There is also a number of "reserved" names for Refs that are useful for certain scenarios: </p>
+ <table style="width: 538px; height: 63px;" border="1" cellpadding="1" cellspacing="1">
+ <tr>
+ <td>
+ <b>Ref Name</b>
+ </td>
+ <td>
+ <b>Remark</b>
+ </td>
+ </tr>
+ <tr>
+ <td>HEAD </td>
+ <td>Points to the currently checkout out commit</td>
+ </tr>
+ <tr>
+ <td>FETCH_HEAD </td>
+ <td>Points to the result of the last fetch operation</td>
+ </tr>
+ <tr>
+ <td>ORIG_HEAD </td>
+ <td>Points to the commit that was checked out before a merge or rebse operation was started</td>
+ </tr>
+ </table>
<p>For a complete list for Ref names and the order of precedence if multiple references have the same shorthand form see the section "Specifying Revisions" section of
<a href="http://www.kernel.org/pub/software/scm/git/docs/git-rev-parse.html" target="egit_external">git rev-parse</a>.
</p>
@@ -607,8 +696,22 @@
<a href="Reference.html#Git_References">Ref</a> and local
<a href="Reference.html#Git_References">Ref</a>. Semantically they define how local branches or tags are mapped to branches or tags in a remote repository. In native git they are combined with a colon in the format &lt;src&gt;:&lt;dst&gt;, preceded by an optional plus sign, + to denote forced update. In EGit they can be displayed and also edited in tabular form in the
<a href="Tasks.html#Push_Ref_Specifications">Push Ref Specification</a> and the
- <a href="Tasks.html#Fetch_Ref_Specifications">Fetch Ref Specification</a> dialogs.
- </p>
+ <a href="Tasks.html#Fetch_Ref_Specifications">Fetch Ref Specification</a> and other dialogs.
+ </p>
+ <p>The "left-hand" side of a RefSpec is called source and the "right-hand" side is called destination. Depending on whether the RefSpec is used for fetch or for push, the semantics of source and destination differ: for a Push RefSpec, the source denotes a Ref in the source Repository and the destination denotes a Ref in the target Repository. </p>
+ <h3 id="Push_Refspecs">Push Refspecs</h3>
+ <p>A typical example for a Push RefSpec could be </p>
+ <pre>HEAD:refs/heads/master
+</pre>
+ <p>
+ This means that the currently checked out branch (as signified by the HEAD Reference, see
+ <a href="Reference.html#Git_References">Git References</a>) will be pushed into the master branch of the remote repository.
+ </p>
+ <h3 id="Fetch_Refspecs">Fetch Refspecs</h3>
+ <p>A typical example for a Fetch RefSpec could be</p>
+ <pre>refs/heads/*:refs/remotes/origin/*
+</pre>
+ <p>This means that all branches from the remote repository will be fetched into the corresponding remote tracking branches of the local repository.</p>
<h2 id="Remotes">Remotes</h2>
<p>Remotes are used to manage the repositories ("remotes") whose branches you track from your repository.</p>
<p>In EGit Remotes are defined when </p>
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 9d66f0494..14d885e5d 100644
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html
@@ -59,90 +59,71 @@
<br/>
</p>
<h2 id="Starting_from_existing_Git_Repositories">Starting from existing Git Repositories</h2>
- <p>In order to work with the content of a Git repository in the Eclipse workbench, the contained files and folders must be imported as projects. In principle, this import can be done using the generic "New Project" or "Import..." wizards, since the working directory of a Git Repository is just a normal directory in the local file system. However, the newly created projects would still have to be shared manually with Git. The "Import Projects from Git" wizards integrates project import and sharing and also offers some extra convenience.</p>
+ <p>In order to work with the content of a Git repository in the Eclipse workbench, the contained files and folders must be imported as projects. In principle, this import can be done using the generic "New Project" or "Import..." wizards, since the working directory of a Git Repository is just a normal directory in the local file system. However, the newly created projects would still have to be shared manually with Git. The "Import Projects from Git" wizards integrates project import and sharing and also offers some extra convenience. </p>
<h3 id="Starting_the_import_wizard">Starting the import wizard</h3>
- <p>To start the wizard click
-
- <b>Import &gt; Git &gt; Projects from Git</b>
+ <p>To start the wizard click
+ <b>Import &gt; Git &gt; Projects from Git</b>
</p>
- <p>If you started in a clean workspace, the first page will display an empty list:</p>
+ <p>If you started in a clean workspace, the first page will display an empty list: </p>
<p>
- <img border="0" src="images/Egit-0.9-import-projects-select-repository.png"/>
+ <img border="0" src="images/Egit-0.9-import-projects-select-repository.png"/>
</p>
- <p>Before you can continue, you need to add one or several Git repositories to the list.
- If you have already repositories in the list, this step is optional.</p>
+ <p>Before you can continue, you need to add one or several Git repositories to the list. If you have already repositories in the list, this step is optional. </p>
<h3 id="Cloning_or_adding_Repositories">Cloning or adding Repositories</h3>
- <p>There are two ways to add Git repositories to the list:</p>
+ <p>There are two ways to add Git repositories to the list: </p>
<ol>
- <li>Clone a remote repository</li>
+ <li>Clone a remote repository </li>
<li>Add an existing repository from your local file system</li>
</ol>
<h4 id="Cloning_a_Repository">Cloning a Repository</h4>
- <p>The first option is used if you start with a remote repository. The clone operation will copy that repository to your local file system. To start the Clone Wizard click
+ <p>The first option is used if you start with a remote repository. The clone operation will copy that repository to your local file system. To start the Clone Wizard click
<b>Clone...</b>. The Clone Wizard is described in more detail in
- <a href="Cloning_Remote_Repositories" title="EGit/User_Guide#Cloning_Remote_Repositories">Cloning Remote Repositories</a>. Upon successful completion of the clone operation, the newly cloned repository appears in the list automatically.
+ <a href="Cloning_Remote_Repositories" title="EGit/User Guide#Cloning_Remote_Repositories">Cloning Remote Repositories</a>. Upon successful completion of the clone operation, the newly cloned repository appears in the list automatically.
</p>
<h4 id="Adding_a_Repository">Adding a Repository</h4>
<p>The second option is useful if you already have a repository in your local file system, for example because you have cloned it earlier, you created it from scratch or you copied it from somewhere else. Click
<b>Add...</b>; and select a directory in the local file system. Press
- <b>Search</b> to trigger a scan for Git repositories contained in this directory. If Git repositories are found, they will be listed and you can select repositories to add :
+ <b>Search</b> to trigger a scan for Git repositories contained in this directory. If Git repositories are found, they will be listed and you can select repositories to add&nbsp;:
</p>
<p>
- <img border="0" src="images/Egit-0.9-import-projects-add-dialog.png"/>
+ <img border="0" src="images/Egit-0.11-import-projects-add-dialog.png"/>
</p>
- <p>After successful completion, the repository list should contain some repositories:</p>
+ <p>After successful completion, the repository list should contain some repositories: </p>
<p>
- <img border="0" src="images/Egit-0.9-import-projects-filled-list.png"/>
+ <img border="0" src="images/Egit-0.11-import-projects-filled-list.png"/>
</p>
<h3 id="Selecting_a_Repository_from_the_List">Selecting a Repository from the List</h3>
<p>You can now select a repository and click
- <b>Next</b>. On the following wizard page, you will have to decide:
+ <b>Next</b>. On the following wizard page, you will decide how to import projects.
</p>
- <ul>
- <li>How to do the import</li>
- <li>How to share the imported projects</li>
- <li>Optionally you may limit the scope of the wizard</li>
- </ul>
+ <h3 id="Importing_projects">Importing projects</h3>
+ <p>This page offers a group with radio buttons that allow you to select a wizard and a directory tree that optionally allows you to select a folder in the working directory.</p>
<p>
- <img border="0" src="images/Egit-0.9-import-projects-select-wizard.png"/>
+ <img border="0" src="images/Egit-0.11-import-projects-select-wizard.png"/>
</p>
- <h3 id="Method_for_importing_Projects">Method for importing Projects</h3>
+ <h3 id="Wizard_for_project_import">Wizard for project import</h3>
<h4 id="Import_Existing_Projects">Import Existing Projects</h4>
- <p>If this radio button is selected, the wizard will scan the local file system for <tt>.project</tt> files and display the projects found for being imported. This is the most comfortable solution and should be used if <tt>.project</tt> files are checked into the Repository.</p>
+ <p>If this radio button is selected, the wizard will scan the local file system for <tt>.project</tt> files and display the projects found for being imported. This is the most comfortable solution and should be used if <tt>.project</tt> files are checked into the Repository. </p>
<h5 id="Limiting_the_Scope_for_Project_Import">Limiting the Scope for Project Import</h5>
<p>In this case, the directory tree at the bottom is active. You can limit the search for <tt>.project</tt> files by selecting a folder in this tree, otherwise the complete working directory of the repository will be scanned. On the next page, a list of the found projects (if any) will be shown. This is very similar to the generic
- <b>Import Existing Projects</b> wizard, but has some additional filtering capabilities:
+ <b>Import Existing Projects</b> wizard, but has some additional filtering capabilities:
</p>
<p>
- <img border="0" src="images/Egit-0.9-import-projects-select-projects.png"/>
+ <img border="0" src="images/Egit-0.9-import-projects-select-projects.png"/>
</p>
<h4 id="Use_the_New_Projects_Wizard">Use the New Projects Wizard</h4>
- <p>When this option is chosen, the generic "New Project" wizard will open. After completion of the "New Project" wizard, the "Import Projects from Git" wizard will resume and assist with sharing the projects you just created.</p>
- <p>In this case, the directory tree at the bottom is inactive, as the selection is not relevant for the "New Project" wizard.</p>
+ <p>When this option is chosen, the generic "New Project" wizard will open. After completion of the "New Project" wizard, the "Import Projects from Git" wizard will resume and assist with sharing the projects you just created. </p>
+ <p>In this case, the directory tree at the bottom is inactive, as the selection is not relevant for the "New Project" wizard. </p>
<h4 id="Import_as_General_Project">Import as General Project</h4>
- <p>This option can be helpful when there are neither <tt>.project</tt> files available nor a suitable "New Project" wizard applies to the content of the Git Repository. If chosen, the wizard will generate a <tt>.project</tt> file and point the project to a folder of the Repository's working directory. The result is a "General Project".</p>
- <p>By default, the newly generated project will point to the working directory of the Repository. By selecting some folder from the directory tree at the bottom, you can have the project generated for that folder.</p>
+ <p>This option can be helpful when there are neither <tt>.project</tt> files available nor a suitable "New Project" wizard applies to the content of the Git Repository. If chosen, the wizard will generate a <tt>.project</tt> file and point the project to a folder of the Repository's working directory. The result is a "General Project". </p>
+ <p>By default, the newly generated project will point to the working directory of the Repository. By selecting some folder from the directory tree at the bottom, you can have the project generated for that folder. </p>
<p>Click
- <b>Next</b> to open a simple dialog for entering a name and a directory for the new project:
- </p>
- <p>
- <img border="0" src="images/Egit-0.9-import-projects-general-project.png"/>
+ <b>Next</b> to open a simple dialog for entering a name and a directory for the new project:
</p>
- <p>By default the suggested project name matches the name of the directory.</p>
- <h3 id="Method_for_Sharing_Imported_Projects">Method for Sharing Imported Projects</h3>
- <p>The newly created projects (if any) must be shared with the correct Git Repository in order to enable the Git Team Provider. The following sharing options are provided:</p>
- <h4 id="Try_to_Share_Newly_Created_Projects_Automatically">Try to Share Newly Created Projects Automatically</h4>
- <p>This is the recommended option: the wizard will automatically detect newly created projects and find the corresponding Repository automatically. No user interaction is required. If automatic sharing fails, the projects will simply remain unshared. You can share them any time later manually.</p>
- <h4 id="Share_New_Projects_Interactively">Share New Projects Interactively</h4>
- <p>This might be useful for special circumstances where the automatic detection fails. Note that this will block the UI until the project import is completed.</p>
- <p>A page will be shown with the newly created projects and the corresponding repositories. Using the check boxes, you can decide which projects to share:</p>
<p>
- <img border="0" src="images/Egit-0.9-import-projects-share-manually.png"/>
+ <img border="0" src="images/Egit-0.9-import-projects-general-project.png"/>
</p>
- <h4 id="Do_Not_Share_New_Projects">Do Not Share New Projects</h4>
- <p>This may be helpful if for some reason you want to share projects manually.
-
- <br/>
+ <p>By default the suggested project name matches the name of the directory.
<br/>
</p>
<h2 id="Working_with_remote_Repositories">Working with remote Repositories</h2>
@@ -221,8 +202,6 @@
</li>
</ul>
<p>
- <b>New:</b> Support for authentication via HTTP or HTTPS protocol is introduced with EGit 0.10.
-
<br/>
<b>Note:</b> If you are behind a firewall you may need to configure your proxy settings (
@@ -234,8 +213,10 @@
<h4 id="Branch_Selection">Branch Selection</h4>
<p>On the next page choose which branches shall be cloned from the remote repository: </p>
<p>
- <img border="0" src="images/Egit-0.9-clone-wizard-branch-page.png"/>
+ <img border="0" src="images/Egit-0.11-clone-wizard-branch-page.png"/>
</p>
+ <p>If you are not sure which branches you need, simply hit "Select All".</p>
+ <p>You can filter the branches by their name by typing using the text control above the list. Note, however, that branches that have been checked will always be shown in the list, i.e. they will not be filtered.</p>
<h4 id="Local_Destination">Local Destination</h4>
<p>On the next page define where you want to store the repository on the local file system and define some initial settings. </p>
<p>
@@ -252,99 +233,134 @@
<b>Remote name</b> - Define a name for the remote repository. The default is "origin".
</li>
</ul>
- <p>
+ <p>The default root path for storing Git repositories can be configured in the preference
+
+ <b>Team &gt; Git &gt; Default Repository Folder</b>
+
<br/>
</p>
<h3 id="Pushing_to_other_Repositories">Pushing to other Repositories</h3>
+ <h4 id="Pushing_to_upstream">Pushing to upstream</h4>
+ <p>If you are working with a local branch which has a so-called "upstream configuration", the most convenient way for pushing relies on this upstream configuration. </p>
+ <p>Typically local branches are created based on a remote tracking branch. Since the remote tracking branch is associated with a remote and the remote contains the information required to access the corresponding remote repository, it is possible to automatically create this upstream configuration while creating the local branch (see
+ <a href="Tasks.html#Branching">Branching</a> for more information).
+ </p>
+ <p>When pushing upstream from the local branch, push requires no further parameters and hence can be performed without showing another dialog based on the stored upstream configuration.</p>
+ <p>In order to push upstream, right-click on a project and select
+ <b>Team &gt; Push to upstream</b> or right-click on a Repository in the Repositories View and click
+ <b>Push to upstream</b>. There is also an action available in the
+ <a href="Reference.html#Git_Workbench_Toolbar_and_Git_Workbench_Menu">Git Command Group</a>.
+ <br/>
+ </p>
+ <p>Push will then be executed immediately after selecting the action. Once finished, a confirmation dialog will be shown displaying information about the pushed data and/or error messages: </p>
+ <p>
+ <img border="0" src="images/Egit-0.11-PushResultDialog.png"/>
+ </p>
+ <h5 id="Configuring_upstream_push">Configuring upstream push</h5>
+ <p>The upstream push can be configured using the "Configure..." button on the confirmation dialog (see above) or by right-clicking a project and selecting
+ <b>Team &gt; Remote &gt; Configure push to upstream...</b>.
+ </p>
+ <p>A configuration dialog will be shown for configuration of push URIs and corresponding branch mappings (RefSpecs): </p>
+ <p>
+ <img border="0" src="images/Egit-0.11-ConfigurePushToUpstream.png"/>
+ </p>
+ <p>The dialog is divided into three main sections. In the upper part, information about the current Repository and the currently checked out branch is shown. The outer Group shows the Push Configuration for the remote that is associated with the current branch (in our case, "origin" as shown in the Group text). </p>
+ <p>In this specific example, there is a warning message that there are several branches that use the remote named "origin". This means that changes in the push configuration will affect all these branches, not just the branch shown in the Branch field.</p>
+ <p>The URI Group contains two controls, a URI field and a Push URIs list. If the list is empty, the URI in the URI field will be used for Push, if at least one entry is in the Push URIs list, the URIs in the list will be used instead. It should be noted that if the Push URIs list is empty and the URI is changed in this dialog, the new URI will also be used for Pull, so care should be taken when doing so.</p>
+ <p>The RefMapping Group allows specification of one or several RefSpecs (see
+ <a href="Reference.html#Refspecs">Refspecs</a>) for Push.
+ </p>
+ <p>The "Add" will open a small wizard that helps in the creation of the RefSpecs. You can also paste a RefSpec from the clipboard into the list.</p>
+ <p>Clicking on the "Advanced" control will show/hide an "Edit (Advanced...)" button that allows for more complex RefSpec editing similar to the
+ <a href="Tasks.html#Push_Wizard">Push Wizard</a> below.
+ </p>
+ <p>The buttons in the lower button bar allow you to save your changes and do the push immediately, save the changes without fetching, dry-run (push without saving the configuration), revert your changes, and Cancel.</p>
<h4 id="Direct_Push">Direct Push</h4>
- <p>The easiest way for pushing is to use
- <a href="Tasks.html#Direct_Fetch_and_Push_Support">Direct Push Support</a> on a Push Specification of a Remote.
+ <p>Alternatively, you can use
+ <a href="Tasks.html#Direct_Fetch_and_Push_Support">Direct Push Support</a> on a Push Specification of a Remote.
</p>
<h4 id="Push_Wizard">Push Wizard</h4>
- <p>The other way is using the Push Wizard
-
- <br/>
-
- <b>Team &gt; Push...</b>
+ <p>The most powerful (but also most complex) way is using the Push Wizard
+ <br/>
+ <b>Team &gt; Remote &gt; Push...</b>
</p>
<h5 id="Push_URI">Push URI</h5>
<ul>
<li>If you already configured a Push Specification in the Repositories View you may also select it here using the drop-down list under
- <b>Configured remote repositories</b>.
+ <b>Configured remote repositories</b>.
</li>
<li>Otherwise click
<b>Custom URI</b> and enter the URI of the upstream repository you want to push to.
</li>
</ul>
<p>
- <img border="0" src="images/Egit-0.9-push-wizard-destination-page.png"/>
+ <img border="0" src="images/Egit-0.9-push-wizard-destination-page.png"/>
</p>
<h5 id="Push_Ref_Specifications">Push Ref Specifications</h5>
+ <p>See also
+ <a href="Reference.html#Refspecs">Refspecs</a> for more explanations.
+ </p>
<p>Click
- <b>Next</b>
-
- <br/>
- If this is the first time you connect to this repository via ssh you will have to accept the host key of the remote repository
+ <b>Next</b>
+ <br/> If this is the first time you connect to this repository via ssh you will have to accept the host key of the remote repository
</p>
<p>
- <img border="0" src="images/Egit-0.9-push-wizard-accept-hostkey.png"/>
+ <img border="0" src="images/Egit-0.9-push-wizard-accept-hostkey.png"/>
</p>
<p>If your ssh key is protected by a passphrase (which is recommended) you have to enter it here </p>
<p>
- <img border="0" src="images/Egit-0.9-push-wizard-ssh-passphrase.png"/>
+ <img border="0" src="images/Egit-0.9-push-wizard-ssh-passphrase.png"/>
</p>
<p>Click
- <b>Add all branches spec</b>
+ <b>Add all branches spec</b>
</p>
<p>
- <img border="0" src="images/Egit-0.9-push-wizard-refspec-allbranches.png"/>
+ <img border="0" src="images/Egit-0.9-push-wizard-refspec-allbranches.png"/>
</p>
<p>This is a convenient way to declare that you want to map your local branch names to the same branch names on the upstream repository you want to push changes to. </p>
<p>Click
- <b>Add all tags spec</b> to map local tags 1:1 to tags in the repository you want to push to.
+ <b>Add all tags spec</b> to map local tags 1:1 to tags in the repository you want to push to.
</p>
- <p>If you want to map local branches to those in the upstream repository in a different way you may define more detailed mapping specifications in the following way</p>
+ <p>If you want to map local branches to those in the upstream repository in a different way you may define more detailed mapping specifications in the following way </p>
<ul>
- <li>enter source and destination ref or select already existing branches from the drop-down lists</li>
+ <li>enter source and destination ref or select already existing branches from the drop-down lists </li>
<li>click
<b>Add spec</b>
</li>
</ul>
<p>This will transfer the newly defined mapping to the list
- <b>Specifications for push</b>
+ <b>Specifications for push</b>
</p>
<p>
- <b>Other common push specs:</b>
+ <b>Other common push specs:</b>
</p>
<ul>
<li>You may e.g. map <tt>refs/heads/*</tt> to <tt>refs/heads/joe/*</tt> if you want to name the branches you push to according to your nickname
- <i>joe</i>. This is useful if multiple users want to publish their local branches on personal branches in a jointly used public repository.
+ <i>joe</i>. This is useful if multiple users want to publish their local branches on personal branches in a jointly used public repository.
</li>
<li>Another usual mapping is to map the source ref <tt>HEAD</tt> to the destination <tt>refs/heads/master</tt>. This means you want to map your current <tt>HEAD</tt> (which might currently point e.g. to any local topic branch) to the upstream master branch.</li>
</ul>
<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>Remote ref to delete</b> and click
<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.
+ <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>
- <img border="0" src="images/Egit-0.9-push-wizard-delete-refspec.png"/>
+ <img border="0" src="images/Egit-0.9-push-wizard-delete-refspec.png"/>
</p>
<h5 id="Conflicting_Push_Ref_Specifications">Conflicting Push Ref Specifications</h5>
<p>If you add multiple conflicting Push Ref Specifications they will be marked in red, solve this by removing or editing the conflicting specs. It is also possible to edit the specs in-place in the list
- <b>Specifications for push</b>
+ <b>Specifications for push</b>
</p>
<p>
- <img border="0" src="images/Egit-0.9-push-wizard-refspec-conflict.png"/>
+ <img border="0" src="images/Egit-0.9-push-wizard-refspec-conflict.png"/>
</p>
<h5 id="Push_Confirmation">Push Confirmation</h5>
<p>Click
- <b>Next</b>
+ <b>Next</b>
</p>
- <p>This will open the Push Confirmation dialog showing a preview which changes will be pushed to the destination repository.
- If this does not match your expectation click
+ <p>This will open the Push Confirmation dialog showing a preview which changes will be pushed to the destination repository. If this does not match your expectation click
<b>Back</b> and correct your push specs accordingly.
</p>
<ul>
@@ -355,19 +371,25 @@
<b>adfdbfd2</b></tt> will be pushed.
</li>
<li>For refs which do not yet exist in the destination repository <tt>
- <b>&#91;new branch&#93;</b></tt> or <tt>
- <b>&#91;new tag&#93;</b></tt> is displayed.
+ <b>
+ <a href="new">branch</a>
+ </b></tt> or <tt>
+ <b>
+ <a href="new">tag</a>
+ </b></tt> is displayed.
</li>
<li>For refs which will be delete <tt>
- <b>&#91;deleted&#93;</b></tt> is shown.
+ <b>
+ <a href="deleted">deleted</a>
+ </b></tt> is shown.
</li>
</ul>
<p>
- <img border="0" src="images/Egit-0.9-push-wizard-confirm-push.png"/>
+ <img border="0" src="images/Egit-0.9-push-wizard-confirm-push.png"/>
</p>
<ul>
<li>Select the
- <b>Push only if remote refs don't change in the mean time</b> check box if you want to be sure that what you see in this preview is also what you get when pushing these changes out.
+ <b>Push only if remote refs don't change in the mean time</b> check box if you want to be sure that what you see in this preview is also what you get when pushing these changes out.
</li>
<li>Select the
<b>Show final report dialog only when it differs from this confirmation report</b> check box if you only want to get a report after executing the push if the result differs from this preview.
@@ -375,28 +397,58 @@
</ul>
<h5 id="Push_Result_Report">Push Result Report</h5>
<p>Click
- <b>Finish</b>
+ <b>Finish</b>
</p>
- <p>Depending on the options you have chosen a push result report dialog is shown</p>
+ <p>Depending on the options you have chosen a push result report dialog is shown </p>
<p>
- <img border="0" src="images/Egit-0.9-push-wizard-push-result.png"/>
+ <img border="0" src="images/Egit-0.9-push-wizard-push-result.png"/>
</p>
- <p>In the box at the bottom the push confirmation message from the remote server is displayed.
- In case of any errors you will find the error message from the remote server here. To see the message for
- a given list entry simply select it in the list.</p>
+ <p>In the box at the bottom the push confirmation message from the remote server is displayed. In case of any errors you will find the error message from the remote server here. To see the message for a given list entry simply select it in the list. </p>
<p>Click
- <b>Ok</b> to close the dialog.
-
+ <b>Ok</b> to close the dialog.
<br/>
<br/>
</p>
<h3 id="Fetching_from_other_Repositories">Fetching from other Repositories</h3>
+ <h4 id="Fetching_from_upstream">Fetching from upstream</h4>
+ <p>If you are working with a local branch which has a so-called "upstream configuration", the most convenient way for fetching relies on this upstream configuration.</p>
+ <p>A local branch is typically created based on a remote tracking branch. Since the remote tracking branch is associated with a remote and this remote contains the information required to access the remote repository, it is possible to automatically create this upstream configuration while creating the local branch (see
+ <a href="Tasks.html#Branching">Branching</a> for more information).
+ </p>
+ <p>When fetching from upstream, this persisted configuration can be used to fetch automatically without the need to provide further parameters in a dialog.</p>
+ <p>In order to fetch from upstream, click
+ <b>Team &gt; Fetch from upstream</b> on a project or click
+ <b>Fetch from upstream</b> on a Repository in the Repositories View. There is also an action available in the
+ <a href="Reference.html#Git_Workbench_Toolbar_and_Git_Workbench_Menu">Git Command Group</a>.
+ </p>
+ <p>Fetch will be executed immediately after selecting the action. Once finished, a confirmation dialog will be shown displaying information about the fetched data and/or error messages:</p>
+ <p>
+ <img border="0" src="images/Egit-0.11-FetchResultDialog.png"/>
+ </p>
+ <h5 id="Configuring_upstream_fetch">Configuring upstream fetch</h5>
+ <p>The upstream fetch can be configured using the "Configure..." button on the confirmation dialog (see above) or by clicking
+ <b>Team &gt; Remote &gt; Configure fetch from upstream...</b> on a project.
+ </p>
+ <p>A configuration dialog will be shown for configuring the fetch URI and branch mappings (RefSpecs):</p>
+ <p>
+ <img border="0" src="images/Egit-0.11-ConfigureFetchFromUpstream.png"/>
+ </p>
+ <p>The dialog is divided into three main sections. In the upper part, information about the current Repository and the currently checked out branch is shown. The outer Group shows the Fetch Configuration for the remote that is associated with the current branch (in our case, "origin" as shown in the Group text). </p>
+ <p>The URI field can be used to add/change the fetch URI.</p>
+ <p>The RefMapping Group allows specification of one or several RefSpecs (see
+ <a href="Reference.html#Refspecs">Refspecs</a>) for Fetch.
+ </p>
+ <p>The "Add" button will open a small wizard that helps in the creation of the RefSpecs. You can also paste a RefSpec from the clipboard into the list.</p>
+ <p>Clicking on the "Advanced" control will show/hide an "Edit (Advanced...)" button that allows for more complex RefSpec editing similar to the
+ <a href="Tasks.html#Fetch_Wizard">Fetch Wizard</a>.
+ </p>
+ <p>The buttons in the lower button bar allow you to save your changes and do the fetch immediately, save the changes without fetching, dry-run (fetch without saving the configuration), revert your changes, and Cancel.</p>
<h4 id="Direct_Fetch">Direct Fetch</h4>
- <p>The easiest way for fetching is to use
+ <p>Another way for fetching is to use
<a href="Tasks.html#Direct_Fetch_and_Push_Support">Direct Fetch Support</a> on a Fetch Specification of a Remote.
</p>
<h4 id="Fetch_Wizard">Fetch Wizard</h4>
- <p>The other way is using the Fetch Wizard
+ <p>The most powerful (but also most complex) way is using the Fetch Wizard
<br/>
@@ -419,15 +471,16 @@
<img border="0" src="images/Egit-0.9-fetch-wizard-source-url-page.png"/>
</p>
<h5 id="Fetch_Ref_Specifications">Fetch Ref Specifications</h5>
+ <p>See also
+ <a href="Reference.html#Refspecs">Refspecs</a> for more explanations.
+ </p>
<p>Click
- <b>Next</b>
-
- <br/>
- Click
- <b>Add all branches spec</b>
+ <b>Next</b>
+ <br/> Click
+ <b>Add all branches spec</b>
</p>
<p>
- <img border="0" src="images/Egit-0.9-fetch-wizard-refspec.png"/>
+ <img border="0" src="images/Egit-0.9-fetch-wizard-refspec.png"/>
</p>
<p>This is a convenient way to declare that you want to map the branch names in the upstream repository you want to fetch changes from 1:1 to the same local branch names. </p>
<ul>
@@ -438,17 +491,17 @@
<li>The default remote name for the repository your repository has been cloned from is <tt>
<b>origin</b></tt>. The master of this remote maps by default from <tt>
<b>refs/heads/master</b></tt> to <tt>
- <b>refs/remotes/origin/master</b></tt>.
+ <b>refs/remotes/origin/master</b></tt>.
</li>
<li>If you e.g. want to additionally track branches from Joe's repository in your local repository you would map the branch in his repository <tt>
<b>refs/heads/*</b></tt> to the following tracking branches <tt>
- <b>refs/remotes/joe/*</b></tt>.
+ <b>refs/remotes/joe/*</b></tt>.
</li>
<li>Deselect
- <b>Force Update</b> if you want to allow fast-forward updates only, select this option if you also want to allow non-fast-forward changes.
+ <b>Force Update</b> if you want to allow fast-forward updates only, select this option if you also want to allow non-fast-forward changes.
</li>
<li>Click
- <b>Force Update all Refs</b> to set the force update option on all specs
+ <b>Force Update all Refs</b> to set the force update option on all specs
</li>
<li>Click
<b>Remove all specs</b> to remove all specs from the list
@@ -460,9 +513,9 @@
<b>Add all tags spec</b> to map tags tags in the repository you want to fetch from 1:1 to local tags.
</li>
</ul>
- <p>If you want to map branches or tags in the upstream repository to local branches in a different way you may define more detailed mapping specifications in the following way</p>
+ <p>If you want to map branches or tags in the upstream repository to local branches in a different way you may define more detailed mapping specifications in the following way </p>
<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>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>
</li>
@@ -496,19 +549,17 @@
<p>
<br/>
</p>
- <h3 id="Pulling_New_Changes_from_Upstream_Repositories">Pulling New Changes from Upstream Repositories</h3>
- <p>Pull is available since EGit 0.10:</p>
+ <h3 id="Pulling_New_Changes_from_Upstream_Branch.3Cbr.3E">Pulling New Changes from Upstream Branch&lt;br&gt;</h3>
<ul>
<li>click
- <b>Team &gt; Pull</b> to pull new changes from the upstream branch your local branch is tracking
+ <b>Team &gt; Pull</b> to pull new changes from the upstream branch your local branch is tracking
</li>
- <li>whenever you create a local branch based on a remote tracking branch EGit configures a tracking relationship so that subsequent pulls will fetch and merge the changes from the tracked upstream branch.</li>
- <li>
- <b>pull --rebase</b> is not yet supported by EGit
+ <li>whenever you create a local branch based on a remote tracking branch EGit can configure a tracking relationship so that subsequent pulls will fetch and then merge or rebase (depending on the configuration of this tracking relationship) the changes from the tracked upstream branch; see
+ <a href="Tasks.html#Branching">Branching</a> for details.
</li>
- <li>ad-hoc selection of the upstream branch to pull from is not yet supported by EGit</li>
</ul>
- <p>Available alternatives currently include: </p>
+ <p>Ad-hoc selection of the upstream branch to pull from is not yet supported by EGit. </p>
+ <p>Available alternatives include: </p>
<ul>
<li>run
<b>git pull</b> from outside eclipse (but
@@ -522,6 +573,34 @@
<br/>
<br/>
</p>
+ <h3 id="Fetching_a_change_from_a_Gerrit_Code_Review_Server">Fetching a change from a Gerrit Code Review Server</h3>
+ <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 fetch a change into your local Repository for inspection and/or modification.
+ </p>
+ <p>Right-click on a project and select
+ <b>Team &gt; Remote &gt; Fetch from Gerrit...</b> or right-click on a Repository node in the Repositories View and select
+ <b>Fetch from Gerrit...</b>
+ </p>
+ <p>A dialog will appear that lets you select or enter a URI and a change as well as some additional options: </p>
+ <p>
+ <img border="0" src="images/Egit-0.11-fetchChangeFromGerritDialog.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 Change field, you must enter the full name of a change; you can either take this value from the Gerrit Web UI, use the content assist described below, or build the name using the following pattern:
+ <br/>"refs/changes/" + (last two digits from change number) + / + (change number) + / + (revision number)
+ </li>
+ <li>In the "Actions to perform after fetch" you can decide what to do after the change has been fetched; you can either create and checkout a branch pointing to the change, create and checkout a tag pointing to the change, or simply checkout the change (thus making HEAD detached); the last option does nothing after fetch, but you will be able to find the commit pertaining to the change at FETCH_HEAD (go to the Repositories View and find FETCH_HEAD under the References node of your Repository, see
+ <a href="Tasks.html#Inspecting_References">Inspecting References </a>).
+ <br/>The name for the branch or tag is suggested by the dialog but can be overwritten as needed.
+ <br/>Since deletion of tags is currently not supported in EGit, we suggest to use local branches rather than tags for the time being. Since the Repositories view allows to group branches hierarchically using "/" as hierarchy separator, the suggested names can come in very handy when dealing with large numbers of changes.
+ </li>
+ </ul>
+ <p>Instead of the tedious copy-paste or manual entering of the change ID, the dialog also offers a content assist for the change. Simply press "CTRL-SPACE" to activate this (consult the tooltip that appears when hovering over the little bulb decorator near the Change field). The Gerrit Server will be contacted and all available changes will be fetched and shown in a content assist dialog: </p>
+ <p>
+ <img border="0" src="images/Egit-0.11-ContentAssistGerritChange.png"/>
+ </p>
+ <p>The list will be filtered with your input in the change field. After selecting the change in the content assist, the Change field will be filled with the correct information.</p>
<h2 id="Inspecting_the_state_of_the_Repository">Inspecting the state of the Repository</h2>
<h3 id="Label_Decorations">Label Decorations</h3>
<p>Label decorations show Git specific information on resources under Git version control. They appear in all views showing model objects, like Package Explorer, Project Explorer, Navigator, Hierarchy View. </p>
@@ -607,23 +686,50 @@
<br/>
</p>
<h3 id="Comparing_Content">Comparing Content</h3>
- <p>In daily work you will often want to see the changes between your last commit, the index, and the current working tree. </p>
- <p>
- <img border="0" src="images/03-CompareWith.png"/>
+ <p>In daily work you will often want to see the changes between your last commit, the index, and the current working tree. In order to do so, select a Resource (project, folder, or file) in the project explorer or navigator and right-click an action under
+ <b>Compare With</b>.
+ </p>
+ <p>To analyze the contents of a specific commit you should use the
+ <a href="Reference.html#History_View">History View</a> which supports this task much better, see task
+ <a href="Tasks.html#Inspecting_Commits">Inspecting Commits</a>.
+ </p>
+ <h4 id="Compare_editor_and_Git_Tree_Compare_View">Compare editor and Git Tree Compare View</h4>
+ <p>If you use any of the submenu actions of
+ <b>Compare With</b> on a single file, a compare editor will be shown, otherwise the
+ <a href="Reference.html#Git_Tree_Compare_View">Git Tree Compare View</a> will be opened that lets you browse the changes; by double-clicking on a changed file in this view, a compare editor will be opened for this file. An excpetion is the submenu action
+ <b>History...</b>, which opens the History View.
</p>
- <p>Currently a compare dialog can only be opened for a single selected file. </p>
<h4 id="Compare_working_tree_with_last_commit">Compare working tree with last commit</h4>
- <p>The difference between a file in the current working directory and in the last commit in the current branch can be viewed from the context menu "Compare With" -&gt; "HEAD revision". This feature is also available in the Commit dialog. Double clicking on an entry in the Commit dialog opens a compare dialog. </p>
+ <p>The difference between a resource in the current working directory and in the last commit in the current branch can be viewed from the context menu
+ <b>Compare With &gt; HEAD revision</b>. This feature is also available in the Commit dialog. Double clicking on an entry in the Commit dialog opens a compare dialog.
+ </p>
<h4 id="Comparing_Working_Tree_with_Index">Comparing Working Tree with Index</h4>
- <p>The difference between a file in the current working directory and in the index can be viewed from the context menu
- <b>Compare With &gt; Git Index</b>.
+ <p>The differences between the current working tree and the index (based on the currently selected resource) can be viewed from the context menu
+ <b>Compare With &gt; Git Index</b>.
</p>
+ <h4 id="Comparing_Working_Tree_with_a_branch_or_tag">Comparing Working Tree with a branch or tag</h4>
+ <ul>
+ <li>Select a resource </li>
+ <li>right-click
+ <b>Compare With &gt; Branch or Tag...</b>
+ </li>
+ <li>select a branch or tag</li>
+ </ul>
<h4 id="Comparing_Working_Tree_with_Any_Commit">Comparing Working Tree with Any Commit</h4>
+ <h5 id="From_the_project_explorer:">From the project explorer:</h5>
+ <ul>
+ <li>Select a resource </li>
+ <li>right-click
+ <b>Compare With &gt; Commit...</b>
+ </li>
+ <li>select a commit from the commit graph</li>
+ </ul>
+ <h5 id="From_the_history_view_.28files_only.29:">From the history view (files only):</h5>
<ul>
<li>Select a file in the package explorer </li>
- <li>from the context menu select
- <b>Show in &gt; History</b> or
- <b>Compare With &gt; History...</b>
+ <li>right-click
+ <b>Team &gt; Show in History</b> or
+ <b>Compare With &gt; History...</b>
</li>
<li>in the commit graph select a commit </li>
<li>from the context menu select
@@ -631,40 +737,43 @@
</li>
<li>this will open a compare dialog showing the changes between the selected commit and the current working tree</li>
</ul>
- <h4 id="Comparing_Two_Commits_with_Each_Other">Comparing Two Commits with Each Other</h4>
+ <h4 id="Comparing_Two_Commits">Comparing Two Commits</h4>
<ul>
- <li>Select a file in the package explorer </li>
- <li>from the context menu select
- <b>Show in &gt; History</b> or
- <b>Compare With &gt; History...</b>
+ <li>Select a resource in the Package Explorer </li>
+ <li>click
+ <b>Team &gt; Show in History</b> or
+ <b>Compare With &gt; History...</b> (the latter for files only)
</li>
<li>in the commit graph select two commits </li>
- <li>from the context menu select
+ <li>right-click
<b>Compare with each other</b>
</li>
- <li>this will open a compare dialog showing the changes between the two selected commits</li>
+ <li>this will open a compare dialog showing the changes between the two selected commits </li>
+ <li>you can also open a Git Tree Compare view by right-clicking
+ <b>Compare with each other in Tree</b>
+ </li>
</ul>
<h4 id="Comparing_Index_with_HEAD_or_Any_Other_Commit">Comparing Index with HEAD or Any Other Commit</h4>
- <p>This feature is not implemented yet.</p>
+ <p>This feature is not implemented yet. </p>
<p>
<br/>
</p>
<h3 id="Comparing_with_Branches_.28Synchronize.29">Comparing with Branches (Synchronize)</h3>
- <p>The difference between two branches can be viewed from project's context menu
- <b>Team &gt; Synchronize</b>. If the git repository contains multiple Eclipse projects it is enough to select one project, the
- <b>Synchronization view</b> will include all other projects. It is critical to have all important files/projects imported into Eclipse because the
+ <p>The difference between two branches can be viewed by clicking
+ <b>Team &gt; Synchronize</b> on a project. If the Git repository contains multiple Eclipse projects it is sufficient to select one project, the
+ <b>Synchronization View</b> will also include all other projects. It is critical to have all important files/projects imported into Eclipse because the
<b>Synchronization view</b> can only dispatch and show files that are known as a resource in Eclipse any other files will
<b>never</b> appear in the
- <b>Synchronization view</b>.
+ <b>Synchronization View</b>.
</p>
<p>After launching
- <b>Synchronize</b> action the
+ <b>Synchronize</b> the
<b>Synchronization dialog</b> will appear.
</p>
<p>
<img border="0" src="images/Synchronize-dialog.jpg"/>
</p>
- <p>Here you can select two branches that should be compared. By checking "include local uncommited changed files" you can include locally made changes and currently staged files in comparison (currently this is not supported by ChangeSet implementation).</p>
+ <p>Select the two branches that should be compared. When clicking "include local uncommited changed files" also local, not yet staged changes and also already staged changes will be shown in comparison (currently this is not supported by ChangeSet implementation).</p>
<p>It is also possible to compare multiple repositories at once. In this case for each repository the
<b>Synchronize dialog</b> will appear and you could select a different configuration for each repository.
</p>
@@ -702,22 +811,21 @@
<p>
<br/>
</p>
- <h3 id="View_Diff_for_a_Commit">View Diff for a Commit</h3>
- <p>To display the diff for a given commit </p>
+ <h3 id="Inspecting_Commits">Inspecting Commits</h3>
+ <p>To inspect a given commit </p>
<ul>
- <li>from context menu in package explorer select
- <b>Team &gt; Show in Resource History</b>
+ <li>from the context menu in package explorer select
+ <b>Team &gt; Show in History</b>
</li>
<li>select the commit you want to inspect </li>
- <li>the history view will display the diff in the lower left pane</li>
- <li>selecting a file in the lower right pane will scroll to the corresponding file section of the diff</li>
</ul>
<p>
<img border="0" src="images/EGit-0.7-ViewDiffInResourceHistory.png"/>
</p>
- <p>
- <br/>
- </p>
+ <h4 id="View_Diff_for_a_Commit">View Diff for a Commit</h4>
+ <p>The history view displays the diff in the lower left pane. Selecting a file in the lower right pane scrolls to the corresponding file section of the diff.</p>
+ <h4 id="Showing_the_contents_of_a_Commit">Showing the contents of a Commit</h4>
+ <p>The behavior of a double click on a file in the lower right pane depends on the state of the compare mode toggle button. If it's on, a compare editor will be opened which compares the file content in the current commit with the content in the ancestor commit; if it's off, an editor will be opened showing the file content in the current commit.</p>
<h2 id="Committing_Changes">Committing Changes</h2>
<p>Modifications to a project under git version control are persisted in the git history through commits. Starting from the state checked out from the git repository modify your project until you have reached a state you are satisfied with and then commit all these changes into the repository as one single commit. Each commit represents a well defined snapshot of all the files stored in the repository. </p>
<h3 id="Modifying_the_content">Modifying the content</h3>
@@ -840,6 +948,11 @@ Signed-off-by: William Shakespeare &lt;will.from@the.past&gt;
<b>Reset to</b> with option
<b>hard</b> to forcefully reset the entire working tree of your repository back to the state of the HEAD commit (See "Resetting your current HEAD" below). This operation will revert all changes in the working tree and the index. You can't do it on a selected set of files using EGit yet.
</p>
+ <h3 id="Reverting_changes_introduced_by_a_specific_commit">Reverting changes introduced by a specific commit</h3>
+ <p>Changes which are introduced by a given commit can be reverted by an automatically created new commit on top of the currently checked out commit. The commit which is to be reverted does not have to be checked out for that.</p>
+ <p>Select the commit in the History View, open the context menu and select
+ <b>Revert Commit</b>. This reverts the changes that the selected commit introduces by creating a new commit on top of the currently checked out commit.
+ </p>
<h3 id="Resetting_your_current_HEAD">Resetting your current HEAD</h3>
<p>Git offers the possibility to reset the HEAD of the current branch to any other commit. It optionally resets the index and the working tree to match that commit. Note that this action affects all files and folders in the enitre repository.</p>
<p>You have the option to do a hard reset, a mixed reset and a soft reset.</p>
@@ -885,51 +998,29 @@ Signed-off-by: William Shakespeare &lt;will.from@the.past&gt;
<br/>
</p>
<h2 id="Branching">Branching</h2>
- <h3 id="Branching_in_the_Repositories_View">Branching in the Repositories View</h3>
- <p>The Repositories View
- <a href="Tasks.html#Branch_and_Tag_Support">supports</a> the following branching actions:
- </p>
- <ul>
- <li>
- <a href="Tasks.html#Check-out_of_Branches_and_Tags">Checkout branches</a>
- </li>
- <li>
- <a href="Tasks.html#Creation_and_Deletion_of_Branches">Creation and deletion of branches</a>
- </li>
- <li>
- <a href="Tasks.html#Determining_the_Checked-out_Branch">Determining the checked out branch</a>
- </li>
- </ul>
<h3 id="Branching_Dialog">Branching Dialog</h3>
- <p>To open the branching dialog click
-
- <br/>
-
- <b>Team &gt; Branch...</b>
+ <p>To open the branching dialog click
+ <br/>
+ <b>Team &gt; Branch...</b>
</p>
<p>
- <img border="0" src="images/Egit-0.8-branch-dialog.png"/>
+ <img border="0" src="images/Egit-0.8-branch-dialog.png"/>
</p>
<h4 id="Creating_a_New_Local_Branch">Creating a New Local Branch</h4>
<ul>
- <li>Select the branch your new branch should be based on</li>
+ <li>Select the branch your new branch should be based on </li>
<li>Click
- <b>New Branch</b>
+ <b>New Branch...</b>
</li>
- <li>Enter the branch name and click
- <b>OK</b>
+ <li>The
+ <a href="Tasks.html#Branch_Creation_Dialog">Branch Creation dialog</a> will be opened
</li>
</ul>
- <p>
- <b>Note:</b> If you create a local branch based on a remote tracking branch a tracking relationship will be configured automatically. When this local branch is checked out a subsequent
- <b>Pull</b> operation will pull new changes into the local branch from the remote tracking branch configured to be tracked by this local branch. You may view and edit this configuration in the
- <a href="Tasks.html#Repository_Configuration">repository configuration</a>.
- </p>
<h4 id="Renaming_an_Existing_Branch">Renaming an Existing Branch</h4>
<ul>
- <li>Select the branch you want to rename</li>
+ <li>Select the branch you want to rename </li>
<li>Click
- <b>Rename</b>
+ <b>Rename</b>
</li>
<li>Enter the new branch name and click
<b>OK</b>
@@ -937,24 +1028,55 @@ Signed-off-by: William Shakespeare &lt;will.from@the.past&gt;
</ul>
<h4 id="Checking_out_a_Branch">Checking out a Branch</h4>
<ul>
- <li>Select the branch you want to check out</li>
+ <li>Select the branch you want to check out </li>
<li>Click
- <b>Checkout</b>
+ <b>Checkout</b>
</li>
</ul>
- <p>
- <br/>
+ <h3 id="Branching_in_the_Repositories_View">Branching in the Repositories View</h3>
+ <p>The Repositories View
+ <a href="Tasks.html#Branch_and_Tag_Support">supports</a> the following branching actions:
</p>
+ <ul>
+ <li>
+ <a href="Tasks.html#Check-out_of_Branches_and_Tags">Checkout branches</a>
+ </li>
+ <li>
+ <a href="Tasks.html#Creation_and_Deletion_of_Branches">Creation and deletion of branches</a>
+ </li>
+ <li>
+ <a href="Tasks.html#Determining_the_Checked-out_Branch">Determining the checked out branch</a>
+ </li>
+ </ul>
<h3 id="Branching_in_the_History_View">Branching in the History View</h3>
- <p>In history view a new branch can be created based on a given commit: select a commit in the history view and execute
- <b>Create Branch...</b> on the context menu. A dialog for branch creation appears:
- </p>
+ <p>In the History View a new branch can be created based on a given commit: </p>
+ <ul>
+ <li>select a commit in the history view </li>
+ <li>click
+ <b>Create Branch...</b>
+ </li>
+ <li>this opens the Branch Creation dialog:</li>
+ </ul>
<p>
- <img border="0" src="images/CreateBranch.png"/>
+ <br/>
+ <img border="0" src="images/Egit-0.11-BranchCreationFromCommitDialog.png"/>
</p>
+ <h3 id="Branch_Creation_Dialog">Branch Creation Dialog</h3>
+ <p>There are several actions available to create a local branch. All these actions use the Branch Creation dialog: </p>
<p>
- <br/>
+ <img border="0" src="images/Egit-0.11-BranchCreationDialog.png"/>
</p>
+ <p>The combo in the upper part allows to select the branch or commit the new branch shall be based on. Typically, this is a remote tracking branch, but it could be any branch or commit in the repository. </p>
+ <p>The "Pull Strategy" group allows to override the default setup for the "upstream configuration" which is helpful when fetching and pushing, but particularly when pulling. Depending on the selected option the following configuration can be chosen: </p>
+ <ul>
+ <li>Rebase: When pulling, new changes will be fetched from upstream and the remote tracking branch will be updated. Then the current local branch will be rebased onto the updated remote tracking branch </li>
+ <li>Merge: When pulling, the changes will be fetched from upstream and the remote tracking branch will be updated. Then the current local branch will be merged with the new changes. This is the default if the new branch is based on a remote tracking branch (but this default may be overriden by specific repository configuration) </li>
+ <li>None: When pulling, no specific upstream configuration will be done for the new branch; however, if a default remote exists (a remote with name "origin", pull will try to use the configuration of this remote; this is the default if the new branch is not based on a remote tracking branch</li>
+ </ul>
+ <p>You may view and edit the upstream configuration in the
+ <a href="Tasks.html#Repository_Configuration">repository configuration</a>.
+ </p>
+ <p>In the lower part, you can decide whether the new branch shall be checked out immediately.</p>
<h2 id="Merging">Merging</h2>
<p>A merge incorporates changes from named commits (since the time their histories diverged from the current branch) into the current branch. </p>
<h3 id="Merging_a_branch_or_a_tag_into_the_current_branch">Merging a branch or a tag into the current branch</h3>
@@ -1240,7 +1362,7 @@ Sein oder nicht sein
<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 &gt; Abort" which is available on the Repository node.</p>
<h3 id="Rebase_Limitation">Rebase Limitation</h3>
- <p>In EGit 0.10 rebase is not yet able to handle all possible version graphs. If the graph is too complicated rebase will abort with an error message. As a workaround until these more complex graphs are also supported by EGit's rebase you may instead use native git from the command line.</p>
+ <p>The current EGit rebase implementation is not yet able to handle all possible version graphs. If the graph is too complicated rebase will abort with an error message. As a workaround until these more complex graphs are also supported by EGit's rebase you may instead use native git from the command line.</p>
<h2 id="Cherry_Picking">Cherry Picking</h2>
<h3 id="Cherry-pick_Introduction">Cherry-pick Introduction</h3>
<p>A given commit
@@ -1350,8 +1472,11 @@ Sein oder nicht sein
<b>OK</b>
</li>
</ul>
+ <h3 id="Deletion_of_tags">Deletion of tags</h3>
+ <p>This is not yet supported.</p>
<h3 id="Light-weight_and_Signed_Tags">Light-weight and Signed Tags</h3>
- <p>Light-weight and signed tags are not yet supported by EGit, use command line <tt>
+ <p>Light-weight tags are shown in the Repositories View as well as in the Create Tag dialog, but can not be edited. In the History View, they are shown as yellow labels.</p>
+ <p>Signed tags are not yet supported by EGit, use command line <tt>
<b>git tag</b></tt> or <tt>
<b>git tag -s</b></tt> instead.
</p>
@@ -1402,154 +1527,151 @@ Sein oder nicht sein
<br/>
</p>
<h2 id="Managing_Repositories">Managing Repositories</h2>
- <p>The "Git Repositories View" is the primary UI element to facilitate working with multiple Repositories simultaneously (i.e. within one Eclipse Workspace).</p>
- <p>This view can be opened using the menu path
-
- <br/>
-
- <b>Windows &gt; Show View &gt; Other... &gt; Git &gt; Git Repositories</b>
+ <p>The "Git Repositories View" is the primary UI element to facilitate working with multiple Repositories simultaneously (i.e. within one Eclipse Workspace). </p>
+ <p>This view can be opened using the menu path
+ <br/>
+ <b>Windows &gt; Show View &gt; Other... &gt; Git &gt; Git Repositories</b>
</p>
- <p>It is also part of the "Git Repository Exploring" perspective available using menu path
-
- <br/>
-
- <b>Window &gt; Open Perspective &gt; Other... &gt; Git Repository Exploring</b>
+ <p>It is also part of the "Git Repository Exploring" perspective available using menu path
+ <br/>
+ <b>Window &gt; Open Perspective &gt; Other... &gt; Git Repository Exploring</b>
</p>
- <p>If you already have projects in your workspace which are shared with a Git Repository, you can use
-
- <br/>
-
- <b>Show In... &gt; Git Repositories</b> or
- <b>Team &gt; Show in Repositories View</b>
+ <p>If you already have projects in your workspace which are shared with a Git Repository, you can use
+ <br/>'
+ <i>Team &gt; Show in Repositories View</i>'
</p>
- <p>on any resource to open the view.</p>
+ <p>on any resource to open the view. </p>
<h3 id="Adding_Repositories_to_the_Git_Repositories_View">Adding Repositories to the Git Repositories View</h3>
- <p>Initially, the Git Repositories View is empty. In order to add Repositories to it, there are several options:</p>
+ <p>Initially, the Git Repositories View is empty. In order to add Repositories to it, there are several options: </p>
<ol>
- <li>Adding a Repository from the Local File System manually</li>
- <li>Cloning a Repository and having the cloned Repository added to the view automatically</li>
- <li>Creating a Repository on the Local File System</li>
+ <li>Adding a Repository from the Local File System manually </li>
+ <li>Cloning a Repository and having the cloned Repository added to the view automatically </li>
+ <li>Creating a Repository on the Local File System </li>
<li>Adding a Repository by pasting a Git Repository path to the view</li>
</ol>
<h4 id="Adding_a_Repository_manually">Adding a Repository manually</h4>
<p>You can add a Repository from your local file system to the Git Repositories View without cloning it. This can be helpful if you are setting up a new Eclipse workspace and want to re-use your Git Repositories. Use the
- <b>Add an existing Git Repository</b> button from the view's toolbar:
+ <b>Add an existing Git Repository</b> button from the view's toolbar:
</p>
<p>
- <img border="0" src="images/RepoMgrAddRepositoryIcon.png"/>
+ <img border="0" src="images/RepoMgrAddRepositoryIcon.png"/>
</p>
<p>A dialog will appear prompting you for a directory of your local file system. After selecting the correct directory, you can hit the
<b>Search</b> button to see a list of Git Repositories in this directory. You can then select some or all found Repositories and add them to the view using
- <b>OK</b>:
+ <b>OK</b>:
</p>
<p>
- <img border="0" src="images/RepoMgrSearchDialog.png"/>
+ <img border="0" src="images/Egit-0.11-import-projects-add-dialog.png"/>
</p>
<h4 id="Cloning_a_Repository_2">Cloning a Repository</h4>
<p>In order to clone a Repository, refer to
- <a href="Tasks.html#Cloning_a_Repository">Cloning remote Repositories</a>. After a successful clone operation, the newly cloned Repository should appear in the Git Repositories View automatically.
+ <a href="Tasks.html#Cloning_a_Repository">Cloning remote Repositories</a>. After a successful clone operation, the newly cloned Repository should appear in the Git Repositories View automatically.
</p>
<p>You can also use the
- <b>Clone a Git Repository</b> button from the view's toolbar to start the Clone wizard:
+ <b>Clone a Git Repository</b> button from the view's toolbar to start the Clone wizard:
</p>
<p>
- <img border="0" src="images/RepoMgrCloneRepositoryIcon.png"/>
+ <img border="0" src="images/RepoMgrCloneRepositoryIcon.png"/>
</p>
<p>Please refer to
- <a href="Tasks.html#Cloning_a_Repository">Cloning remote Repositories</a> about how to use the wizard.
+ <a href="Tasks.html#Cloning_a_Repository">Cloning remote Repositories</a> about how to use the wizard.
</p>
<h4 id="Creating_a_Repository">Creating a Repository</h4>
<p>You can create a new, empty repository on the local file system. This is useful if you later on want to create one or more new projects below this repository. Another usecase is to create a new bare repository where you can push to. Use the
- <b>Create a new Git Repository</b> button from the view's toolbar:
+ <b>Create a new Git Repository</b> button from the view's toolbar:
</p>
<p>
- <img border="0" src="images/RepoMgrCreateRepositoryIcon.png"/>
+ <img border="0" src="images/RepoMgrCreateRepositoryIcon.png"/>
</p>
- <p>A dialog will appear which lets you choose a directory:</p>
+ <p>A dialog will appear which lets you choose a directory: </p>
<p>
- <img border="0" src="images/RepoMgrCreateRepositoryDialog.png"/>
+ <img border="0" src="images/RepoMgrCreateRepositoryDialog.png"/>
</p>
<p>If you select the checkbox
- <b>Create as Bare Repository</b> the new repository will not have a working directory. You then can only add content by pushing changes from another repository.
+ <b>Create as Bare Repository</b> the new repository will not have a working directory. You then can only add content by pushing changes from another repository.
</p>
<h4 id="Adding_a_Repository_using_Copy_and_Paste">Adding a Repository using Copy and Paste</h4>
- <p>As a shortcut, it is also possible to paste the local file system path of a Git repository from the clipboard into this view. In order to do so, copy the path of a Git repository (the full path of its <code>.git</code> folder) to the clipboard, then open the context menu on the view panel:</p>
+ <p>As a shortcut, it is also possible to paste the local file system path of a Git repository from the clipboard into this view. In order to do so, copy the path of a Git repository (the full path of its <code>.git</code> folder) to the clipboard, then open the context menu on the view panel: </p>
<p>
- <img border="0" src="images/RepoMgrPasteRepositoryPath.png"/>
+ <img border="0" src="images/RepoMgrPasteRepositoryPath.png"/>
</p>
<p>or click
- <b>Edit &gt; Paste</b> from the main menu (or the corresponding keyboard shortcut). If the clipboard content is not suitable, an error popup will be displayed, otherwise the added Repository should appear automatically.
+ <b>Edit &gt; Paste</b> from the main menu (or the corresponding keyboard shortcut). If the clipboard content is not suitable, an error popup will be displayed, otherwise the added Repository should appear automatically.
</p>
- <p>After the view has been populated with some repositories, it should look like this:</p>
+ <p>After the view has been populated with some repositories, it should look like this: </p>
<p>
- <img border="0" src="images/RepoMgrViewWithRepos.png"/>
+ <img border="0" src="images/RepoMgrViewWithRepos.png"/>
</p>
<h3 id="Removing_Repositories">Removing Repositories</h3>
<h4 id="Removing_a_Repository_from_the_Repositories_View">Removing a Repository from the Repositories View</h4>
<p>In order to remove a repository from the Repositories View select a repository and click "Remove Repository" </p>
<p>
- <img border="0" src="images/Egit-0.10-RemoveRepository.png"/>
+ <img border="0" src="images/Egit-0.10-RemoveRepository.png"/>
</p>
<h4 id="Deleting_a_Repository">Deleting a Repository</h4>
- <p>In order to delete a repository, select it in the Repositories View and click "Delete Repository".</p>
+ <p>In order to delete a repository, select it in the Repositories View and click "Delete Repository". </p>
<p>
- <img border="0" src="images/Egit-0.10-DeleteRepository.png"/>
+ <img border="0" src="images/Egit-0.10-DeleteRepository.png"/>
</p>
- <p>Then confirm that you want to delete the repository</p>
+ <p>Then confirm that you want to delete the repository </p>
<p>
- <img border="0" src="images/Egit-0.10-ConfirmRepositoryDeletion.png"/>
+ <img border="0" src="images/Egit-0.10-ConfirmRepositoryDeletion.png"/>
</p>
- <p>and decide if you want to delete projects contained in the repository from the Eclipse workspace.</p>
+ <p>and decide if you want to delete projects contained in the repository from the Eclipse workspace. </p>
<p>
- <img border="0" src="images/Egit-0.10-ConfirmProjectRemoval.png"/>
+ <img border="0" src="images/Egit-0.10-ConfirmProjectRemoval.png"/>
</p>
<p>
- <br/>
+ <br/>
</p>
<h3 id="Structure_of_the_Git_Repositories_View">Structure of the Git Repositories View</h3>
- <p>The following screenshot shows the topmost two levels of the Git Repositories View:</p>
+ <p>The following screenshot shows the topmost two levels of the Git Repositories View: </p>
<p>
- <img border="0" src="images/RepoMgrTopLevelNodes.png"/>
+ <img border="0" src="images/Egit-0.11-RepoViewTopLevel.png"/>
</p>
- <p>The root node represents the Repository itself. The node text indicates the name of the Repository and its location in the local file system. The "Branches" and "Tags" nodes allow browsing and manipulation of tags and branches. The "Symbolic References" node lists other references which are not branches or tags, most notably the "HEAD" symbolic reference.</p>
- <p>The "Working directory" node displays the location and structure of the working directory on the local file system (only in case of a development, or non-bare Repository, for bare Repositories, this node is always a leaf).</p>
+ <p>The root node represents the Repository itself. The node text indicates the name of the Repository and its location in the local file system. The "Branches" and "Tags" nodes allow browsing and manipulation of tags and branches. The "References" node lists other references which are not branches or tags, most notably the "HEAD" and "FETCH_HEAD" symbolic references (see
+ <a href="Reference.html#Git_References">Git References</a>).
+ </p>
+ <p>The "Working directory" node displays the location and structure of the working directory on the local file system (only in case of a development, or non-bare Repository, for bare Repositories, this node is always a leaf). </p>
<p>Finally, the "Remotes" node allows browsing and manipulating the remote configurations used for Fetch and Push.</p>
<h3 id="Functions_of_the_Git_Repositories_View">Functions of the Git Repositories View</h3>
<h4 id="Project_Import">Project Import</h4>
- <p>In order to work with the contents of a Git Repository, its files and folders must be imported into the Eclipse workspace in the form of projects. While the Git Clone wizard allows to do such imports directly after cloning, the Git Repositories View allows to trigger project imports independently of the clone operation.</p>
- <p>The "Import Projects..." context menu is available on the "Repository" node as well as on any "Folder" node within the "Working Directory" node and the "Working Directory" node itself:</p>
+ <p>In order to work with the contents of a Git Repository, its files and folders must be imported into the Eclipse workspace in the form of projects. While the Git Clone wizard allows to do such imports directly after cloning, the Git Repositories View allows to trigger project imports independently of the clone operation. </p>
+ <p>The "Import Projects..." context menu is available on the "Repository" node as well as on any "Folder" node within the "Working Directory" node and the "Working Directory" node itself: </p>
<p>
- <img border="0" src="images/RepoMgrImportNodes.png"/>
+ <img border="0" src="images/Egit-0.11-ImportProjectsFromRepoView.png"/>
</p>
<p>The rationale for offering the
- <b>Import Projects...</b> action on several nodes is that some of the wizards used for importing projects can take the file system directory into account, for example the
- <b>Import Existing Projects</b> wizard. If the import is started from the "Repository" or the "Working Directory" node, the working directory of the repository is set as context, otherwise the directory corresponding to the currently selected "Folder" node.
+ <b>Import Projects...</b> action on several nodes is that some of the wizards used for importing projects can take the file system directory into account, for example the
+ <b>Import Existing Projects</b> wizard. If the import is started from the "Repository" or the "Working Directory" node, the working directory of the repository is set as context, otherwise the directory corresponding to the currently selected "Folder" node.
</p>
<p>The details of project import are discussed in
- <a href="Tasks.html#Use_the_New_Projects_Wizard">Use the New Projects Wizard</a>.
+ <a href="Tasks.html#Use_the_New_Projects_Wizard">Use the New Projects Wizard</a>.
</p>
<h4 id="Branch_and_Tag_Support">Branch and Tag Support</h4>
- <p>The "Branches" node allows to create, browse, checkout and delete local and remote branches. The "Tags" node allows for browsing and checking out of tags. Both the "Branches" node and the "Tags" node allow for merging the branch or tag into the currently checked out branch and also for synchronizing with the currently checked out branch.</p>
- <p>For better readability, branches are organized in two sub-nodes for local and remote branches, respectively, and only the shortened names are displayed, e.g. instead of <tt>"refs/heads/master"</tt> you would find an entry <tt>"master"</tt> under the "Local Branches" node, instead of <tt>"refs/remotes/origin/master"</tt> the shortened name <tt>"origin/master"</tt> is displayed under the "Remote Branches" node. Similarly, tag names are shortened by omitting the <tt>"refs/tags/"</tt> prefix:</p>
+ <p>The "Branches" node allows to create, browse, checkout and delete local and remote branches. The "Tags" node allows to browse and check out tags. Both the "Branches" node and the "Tags" node allow to merge the branch or tag into the currently checked out branch and also to synchronize with the currently checked out branch. </p>
+ <p>For better readability, branches are organized in two sub-nodes for local and remote branches, respectively, and only the shortened names are displayed, e.g. instead of <tt>"refs/heads/master"</tt> you would find an entry <tt>"master"</tt> under the "Local Branches" node, instead of <tt>"refs/remotes/origin/master"</tt> the shortened name <tt>"origin/master"</tt> is displayed under the "Remote Branches" node. Similarly, tag names are shortened by omitting the <tt>"refs/tags/"</tt> prefix: </p>
<p>
- <img border="0" src="images/RepoMgrBranchesAndTags.png"/>
+ <img border="0" src="images/RepoMgrBranchesAndTags.png"/>
</p>
<h5 id="Check-out_of_Branches_and_Tags">Check-out of Branches and Tags</h5>
- <p>Branches and tags can be checked out by either double-clicking on the respective node or by selecting the corresponding context menu entry.</p>
+ <p>Branches and tags can be checked out by either double-clicking on the respective node or by selecting the corresponding context menu entry. </p>
<h5 id="Creation_and_Deletion_of_Branches">Creation and Deletion of Branches</h5>
- <p>Local branches can be created using a simple wizard. After selecting the corresponding context menu entry (available on the "Branches", the "Local Branches", and on any "Branch" and "Tag" node), you are asked to enter a source branch and a name for the new branch. Depending on whether you have called the wizard from a "Branch" or "Tag" node or not, the source branch drop-down will be pre-selected with either the selected branch, the selected tag or the currently checked-out branch:</p>
- <p>
- <img border="0" src="images/RepoMgrCreateBranch.png"/>
+ <p>Local branches can be created using the
+ <a href="Tasks.html#Branch_Creation_Dialog">Branch Creation Dialog</a>. The wizard is opened by right-clicking on the "Branches", the "Local Branches" on any "Branch" and "Tag" node).
</p>
- <p>You can change the source branch using the drop-down. By default, the newly created branch will be checked out after creation. Deselect the corresponding checkbox on the wizard if you don't want this to happen.</p>
<p>Branch deletion is done using the corresponding context menu entry.</p>
+ <h5 id="Rebasing_2">Rebasing</h5>
+ <p>You can trigger rebasing of the currently checked-out branch onto another branch by right-clicking
+ <b>Rebase</b> on any (local or remote tracking) branch node.
+ </p>
<h5 id="Merging_a_Branch_or_a_Tag">Merging a Branch or a Tag</h5>
<p>You can trigger a merge from any branch and tag node and from the repository node if you have checked out a local branch. See
- <a href="Tasks.html#Merging">Merging</a> for further details of the merging features.
+ <a href="Tasks.html#Merging">Merging</a> for further details of the merging features.
</p>
<ul>
<li>When you select any branch node other than the currently checked out branch or any tag node, use
- <b>Merge</b> to directly trigger a merge into the currently checked out branch.
+ <b>Merge</b> to directly trigger a merge into the currently checked out branch.
</li>
</ul>
<ul>
@@ -1560,24 +1682,35 @@ Sein oder nicht sein
</ul>
<h5 id="Synchronizing_with_a_Branch_or_a_Tag">Synchronizing with a Branch or a Tag</h5>
<p>You can perform a comparison of the changes in your HEAD with the changes done in any other branch or tag. Right click and select
- <b>Synchronize...</b> on any branch or tag. Then the eclipse synchronize view opens which contains a representation of the changes that are contained in your HEAD but not on the other branch or tag (outgoing change) or vice versa (incoming change). Please refer to the documentation of the synchronize feature for further details.
+ <b>Synchronize...</b> on any branch or tag. Then the eclipse synchronize view opens which contains a representation of the changes that are contained in your HEAD but not on the other branch or tag (outgoing change) or vice versa (incoming change). Please refer to the documentation of the synchronize feature for further details.
</p>
<h5 id="Determining_the_Checked-out_Branch">Determining the Checked-out Branch</h5>
- <p>There are two ways to determine which branch or tag is currently checked out: the checked out branch/tag node is decorated with a little check mark and the "HEAD" entry under the "Symbolic References" node shows the (full) name of the checked out branch:</p>
+ <p>There are two ways to determine which branch or tag is currently checked out: the checked out branch/tag node is decorated with a little check mark and the "HEAD" entry under the "Symbolic References" node shows the (full) name of the checked out branch: </p>
<p>
- <img border="0" src="images/RepoMgrCheckedOutBranch.png"/>
+ <img border="0" src="images/RepoMgrCheckedOutBranch.png"/>
</p>
<h5 id="Resetting_to_a_Branch_or_a_Tag">Resetting to a Branch or a Tag</h5>
<p>Right click and select
<b>Reset...</b> on any branch or tag. This opens a dialog which lets you decide on the reset type. See
- <a href="Tasks.html#Resetting_your_current_HEAD">Resetting you current HEAD</a> for further details.
+ <a href="Tasks.html#Resetting_your_current_HEAD">Resetting you current HEAD</a> for further details.
</p>
<h5 id=".22Detached.22_HEAD">"Detached" HEAD</h5>
<p>If HEAD is "detached", i.e. is not pointing to the tip of a local branch but to a commit or tag, then none or several "checked-out" markers may appear in the tree, since any number of remote branch or tags may point to the currently checked out commit. The state you are in while your HEAD is detached is not recorded by any branch (which is natural --- you are not on any branch).</p>
+ <h4 id="Inspecting_References">Inspecting References</h4>
+ <p>The References node displays some References other than branches and tags (the list is dynamic and depends on the current state of the Repository): </p>
+ <p>
+ <img border="0" src="images/Egit-0.11-RepoViewReferencesNode.png"/>
+ </p>
+ <p>If the Reference is symbolic, i.e. points to another Reference, the name of the target reference is shown, followed by the object ID of the reference's target. If the Reference is not symbolic, only the object ID is shown. </p>
+ <p>In the example above, HEAD is a symbolic Reference pointing to branch "refs/heads/master" (i.e. branch "master" is checked out", while FETCH_HEAD points directly to commit 226a7f... . </p>
+ <p>The following actions are available on right-clicking on a Reference:
+ <b>Checkout '''(unless the Reference is already checked out) and '''Create Branch</b>
+ <b>...</b> .
+ </p>
<h4 id="Browsing_the_Working_Directory">Browsing the Working Directory</h4>
- <p>The "Working Directory" node visualizes the local file system structure of the Git Repository. It is also possible to open a text editor on the files:</p>
+ <p>The "Working Directory" node visualizes the local file system structure of the Git Repository. It is also possible to open a text editor on the files: </p>
<p>
- <img border="0" src="images/RepoMgrOpenTextEditor.png"/>
+ <img border="0" src="images/RepoMgrOpenTextEditor.png"/>
</p>
<p>Also, on all file and folder nodes as well as on the "Repository" node, an option is offered to copy the (file-system specific) path to the clipboard. This is sometimes useful when the path is needed, for example to open a directory using a file browser or to copy and paste Repositories between view instances (see above about how to add Repositories to the view). The
<b>Copy to Clipboard</b> action is also available using
@@ -1585,111 +1718,146 @@ Sein oder nicht sein
</p>
<h4 id="Repository_Configuration">Repository Configuration</h4>
<p>Integration with the generic "Properties" view in Eclipse allows to view and edit the Git Configuration (global and repository-specific configuration). If the "Properties" view is open, it is updated automatically when a "Repository" node is selected. For convenience, an
- <b>Open Properties view</b> action is provided in the context menu:
+ <b>Open Properties view</b> action is provided in the context menu:
</p>
<p>
- <img border="0" src="images/RepoMgrPropertiesView.png"/>
+ <img border="0" src="images/RepoMgrPropertiesView.png"/>
</p>
<p>With a drop down box (left red box in the screen shot) you can switch between the display of the Repository Configutarion, the Global Configuration and a view which aggregates both. If the view displays the Repository Configutarion or the Global Configuration you can open an editor dialog with the
<b>Edit</b> button (right red box in the screen shot). The editor dialog has the same functionality as the preference page
- <b>Team &gt; Git &gt; Configuration</b>.
+ <b>Team &gt; Git &gt; Configuration</b>.
</p>
<h4 id="Remote_Repositories">Remote Repositories</h4>
<p>The "Remotes" node allows for browsing and editing Remote configurations. Each Remote configuration has a name and either a Push Specification, a Fetch Specification, or both. If a "Remote Configuration" node or any of its children is selected, the
- <b>Properties</b> view will show a summary of the Remote configuration. In this example: there is a Remote configuration named "origin" which only has a Fetch Specification, but no Push Specification:
+ <b>Properties</b> view will show a summary of the Remote configuration. In this example: there is a Remote configuration named "origin" which only has a Fetch Specification, but no Push Specification:
</p>
<p>
- <img border="0" src="images/RepoMgrRemoteConfig.png"/>
+ <img border="0" src="images/RepoMgrRemoteConfig.png"/>
</p>
<p>Menu actions are provided to add, configure, and remove Remote configurations and Fetch and Push Specifications. </p>
<h5 id="Direct_Fetch_and_Push_Support">Direct Fetch and Push Support</h5>
- <p>It is possible to execute fetch and push directly (i.e. without a wizard) on the respective "Fetch" and "Push" nodes:</p>
+ <p>It is possible to execute fetch and push directly (i.e. without a wizard) on the respective "Fetch" and "Push" nodes: </p>
<p>
- <img border="0" src="images/RepoMgrSimpleFetch.png"/>
+ <img border="0" src="images/RepoMgrSimpleFetch.png"/>
</p>
- <p>Note that the fetch or push operation will be executed immediately in an asynchronous job; on completion you will get a confirmation pop-up displaying the fetch result.</p>
- <p>The "Fetch" node contains a so called fetch specification and the "Push" node contains a so called push specification.</p>
+ <p>Note that the fetch or push operation will be executed immediately in an asynchronous job; on completion you will get a confirmation pop-up displaying the fetch result. </p>
+ <p>The "Fetch" node contains a so called fetch specification and the "Push" node contains a so called push specification. </p>
<p>A default fetch specification is created when the repository is cloned. You can edit the fetch specification with the menu entry
<b>Configure Fetch...</b>. This opens a wizard. On the first page you can edit the Fetch URI. Ob the second page you can determine the fetch ref specifications, see
- <a href="Tasks.html#Fetch_Ref_Specifications">Fetch Ref Specifications</a>.
+ <a href="Tasks.html#Fetch_Ref_Specifications">Fetch Ref Specifications</a>.
</p>
<p>You can create or edit a push specification with the menu entry
<b>Configure Push...</b>. This opens a wizard. On the first page you can edit the Push URIs. If a fetch is specified the fetch URI is automatically included into the push specification and no additional Push URI is needed. On the second page you can determine the push ref specifications, see
- <a href="Tasks.html#Push_Ref_Specifications">Push Ref Specifications</a>.
+ <a href="Tasks.html#Push_Ref_Specifications">Push Ref Specifications</a>.
</p>
<h5 id="Adding_a_Remote_Configuration">Adding a Remote Configuration</h5>
- <p>This is done using a context menu action on the "Remotes" node. A wizard is started asking for the name of the new configuration and whether to configure Fetch, Push, or both:</p>
+ <p>This is done using a context menu action on the "Remotes" node. A wizard is started asking for the name of the new configuration and whether to configure Fetch, Push, or both: </p>
<p>
- <img border="0" src="images/RepoMgrNewRemote.png"/>
+ <img border="0" src="images/RepoMgrNewRemote.png"/>
</p>
<p>If the
- <b>Configure Fetch</b> checkbox was selected, the next wizard page will ask for the URI of the Repository to fetch from:
+ <b>Configure Fetch</b> checkbox was selected, the next wizard page will ask for the URI of the Repository to fetch from:
</p>
<p>
- <img border="0" src="images/Egit-0.9-repo-view-createRemoteWizardFetch.png"/>
+ <img border="0" src="images/Egit-0.9-repo-view-createRemoteWizardFetch.png"/>
</p>
<p>Click
- <b>Change...</b> to open a dialog that allows you to select a URI.
- The next step is to define the Remote Specification for the fetch URI. See
- <a href="Tasks.html#Fetch_Ref_Specifications">Fetch Ref Specifications</a> about the details.
+ <b>Change...</b> to open a dialog that allows you to select a URI. The next step is to define the Remote Specification for the fetch URI. See
+ <a href="Tasks.html#Fetch_Ref_Specifications">Fetch Ref Specifications</a> about the details.
</p>
<p>If the
<b>Configure Push</b> checkbox was selected, the next wizard page will ask for the URIs of the repositories to push to. This is actually a list, as you can push to multiple repositories at once. Click
<b>Add....</b> to add URIs to the list using the same dialog as above. You can remove URIs by marking them in the list and hitting
- <b>Remove</b>.
- This step is completely optional if there is already a fetch URI defined. In this case, the fetch URI will also be used for push. If at least one push URI is defined in this steps, it will override the fetch URI. In this example, there is already a fetch URI, so the
- <b>Next</b> button is enabled, even though there is no Push URI in the list:
+ <b>Remove</b>. This step is completely optional if there is already a fetch URI defined. In this case, the fetch URI will also be used for push. If at least one push URI is defined in this steps, it will override the fetch URI. In this example, there is already a fetch URI, so the
+ <b>Next</b> button is enabled, even though there is no Push URI in the list:
</p>
<p>
- <img border="0" src="images/Egit-0.9-repo-view-createRemoteWizardPush.png"/>
+ <img border="0" src="images/Egit-0.9-repo-view-createRemoteWizardPush.png"/>
</p>
<p>The next step is to define the Remote Specification for the push URIs. See
- <a href="Tasks.html#Push_Ref_Specifications">Push Ref Specifications</a> about the details.
+ <a href="Tasks.html#Push_Ref_Specifications">Push Ref Specifications</a> about the details.
</p>
- <p>Upon completion, the new Remote configuration will be visible:</p>
+ <p>Upon completion, the new Remote configuration will be visible: </p>
<p>
- <img border="0" src="images/RepoMgrRemoteCreated.png"/>
+ <img border="0" src="images/RepoMgrRemoteCreated.png"/>
</p>
<h5 id="Changing_Remote_Configurations">Changing Remote Configurations</h5>
- <p>It is also possible to add, remove, or change Fetch/Push Specifications for an existing Remote configuration using the context menu.</p>
+ <p>It is also possible to add, remove, or change Fetch/Push Specifications for an existing Remote configuration using the context menu. </p>
<h3 id="Refresh">Refresh</h3>
<p>The view is auto-refreshed periodically. The
- <b>Refresh</b> button in the toolbar allows to trigger an immediate refresh:
+ <b>Refresh</b> button in the toolbar allows to trigger an immediate refresh:
</p>
<p>
- <img border="0" src="images/RepoMgrRefresh.png"/>
+ <img border="0" src="images/RepoMgrRefresh.png"/>
</p>
<h3 id="Link_with_Selection">Link with Selection</h3>
<p>If the
- <b>Link with selection</b> toggle is enabled, the file or folder corresponding to the current workbench selection will be displayed automatically:
+ <b>Link with selection</b> toggle is enabled, the file or folder corresponding to the current workbench selection will be displayed automatically:
</p>
<p>
- <img border="0" src="images/RepoMgrLinkWithSelection.png"/>
+ <img border="0" src="images/RepoMgrLinkWithSelection.png"/>
</p>
<h3 id="Link_with_Editor">Link with Editor</h3>
<p>If the
- <b>Link with editor</b> toggle is enabled, the file or folder corresponding to the currently active editor will be displayed automatically:
+ <b>Link with editor</b> toggle is enabled, the file or folder corresponding to the currently active editor will be displayed automatically:
</p>
<p>
- <img border="0" src="images/RepoMgrLinkWithEditor.png"/>
+ <img border="0" src="images/RepoMgrLinkWithEditor.png"/>
</p>
<h3 id="Hierarchical_Branch_Layout">Hierarchical Branch Layout</h3>
<p>If the
- <b>Hierarchical Branch Layout</b> toggle is enabled, branches will be shown in a hierarchical layout using slash (/) as hierarchy separator:
+ <b>Hierarchical Branch Layout</b> toggle is enabled, branches will be shown in a hierarchical layout using slash (/) as hierarchy separator:
</p>
<p>
- <img border="0" src="images/RepoMgrHierarchicalBranchLayout.png"/>
+ <img border="0" src="images/RepoMgrHierarchicalBranchLayout.png"/>
</p>
- <p>This can be helpful for organizing large numbers of branches.</p>
+ <p>This can be helpful for organizing large numbers of branches. </p>
<h3 id="Bare_Repositories">Bare Repositories</h3>
- <p>"Bare" Git Repositories (as opposed to "development" or "standard" Repositories) have no working directory by definition, so all actions related to the working directory (check-out, project import, browsing the working directory) are not available for such Repositories. The "Bare-ness" of a Repository is visualized on the "Working Directory" node, which is always a leaf:</p>
+ <p>"Bare" Git Repositories (as opposed to "development" or "standard" Repositories) have no working directory by definition, so all actions related to the working directory (check-out, project import, browsing the working directory) are not available for such Repositories. The "Bare-ness" of a Repository is visualized on the "Working Directory" node, which is always a leaf: </p>
<p>
<img border="0" src="images/RepoMgrBareRepository.png"/>
</p>
+ <p>Bare repositories are only changed by pushing changes to them.</p>
<h3 id="Removing_Repositories_from_the_Git_Repositories_View">Removing Repositories from the Git Repositories View</h3>
- <p>This is offered as a menu action on the "Repository" node. Note that this does not delete the Repository, but just removes the node from the view. If there are projects in the workspace which are located in the working directory of the Repository, the user will be prompted to confirm deletion of these projects from the Eclipse workspace.</p>
+ <p>This is offered as a menu action on the "Repository" node. Note that this does not delete the Repository, but just removes the node from the view. If there are projects in the workspace which are located in the working directory of the Repository, the user will be prompted to confirm deletion of these projects from the Eclipse workspace. </p>
<p>
<br/>
+ </p>
+ <h2 id="Working_with_Tasks">Working with Tasks</h2>
+ <p>
+ <b>New:</b> EGit 0.11 features a first integration with Mylyn to support working with task repositories.
+ </p>
+ <h3 id="Installation">Installation</h3>
+ <p>You need to install the feature "EGit Mylyn" to use the EGit Mylyn integration. This requires also Mylyn to be installed.</p>
+ <h3 id="Commit_Message_Template">Commit Message Template</h3>
+ <ul>
+ <li>Configure the Mylyn commit message template under
+ <b>Preferences &gt; Tasks &gt; Team</b> and edit
+ <b>Commit Comment Template</b>.
+ </li>
+ <li>Use the following variables as well as any text to alter the commit message.
+ <ul>
+ <li>connector.task.prefix, repository.kind, repository.url, task.assignee, task.cc, task.description, task.id, task.key, task.keywords, task.lastmodified, task.notes, task.priority, task.product, task.reporter, task.resolution, task.status, task.summary, task.type, task.url, task.completiondate, task.creationdate, task.reminderdate</li>
+ </ul>
+ </li>
+ </ul>
+ <p>
+ <img border="0" src="images/Egit-0.11-configure-commit-template.png"/>
+ </p>
+ <ul>
+ <li>Before committing your change activate the corresponding Task using the Mylyn UI.</li>
+ </ul>
+ <p>
+ <img border="0" src="images/Egit-0.11-activate-task.png"/>
+ </p>
+ <ul>
+ <li>When launching the commit dialog EGit will pre-populate the commit message using the commit message template. </li>
+ </ul>
+ <p>
+ <img border="0" src="images/Egit-0.11-commit-using-template.png"/>
+ </p>
+ <p>See the
+ <a href="http://wiki.eclipse.org/index.php/Mylyn/User_Guide" target="egit_external">Mylyn User Guide</a> for more information how to work with tasks.
</p><hr/>
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
<tr>
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 1dad66b22..1d373a18d 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
@@ -34,21 +34,44 @@
</p>
<h2 id="Basic_Tutorial:_Adding_a_project_to_version_control">Basic Tutorial: Adding a project to version control</h2>
<h3 id="Configuration">Configuration</h3>
+ <h4 id="Identifying_yourself">Identifying yourself</h4>
+ <p>Whenever the history of the repository is changed (technically, whenever a commit is created), Git keeps track of the user who created that commit. The identification consists of a name (typically a person's name) and an e-mail address. This information is stored in file <code>~/.gitconfig</code> under dedicated keys.
+ <br/>
+ </p>
+ <p>EGit will ask you for this information when you create your first commit. By default, this dialog is shown only once until you create a new workspace or tick the checkbox "Show initial configuration dialog" on the Git Preference page: </p>
+ <p>
+ <img border="0" src="images/Egit-0.11-initialConfigurationDialog.png"/>
+ </p>
+ <p>You can also untick "Don't show this dialog again" if you want to see it again later.</p>
+ <p>Instead of using this dialog, you can always change this information using the Git configuration:
+ <br/>
+ </p>
<ul>
- <li>First you need to tell Git about yourself, click
- <b>Preferences &gt; Team &gt; Git &gt; Configuration</b>
+ <li>Click
+ <b>Preferences &gt; Team &gt; Git &gt; Configuration</b>
</li>
<li>Click
<b>New Entry</b> and enter the key value pairs <code>user.email</code> and <code>user.name</code>
+ <br/>
</li>
- <li>This information is stored in <code>~/.gitconfig</code> and will be used by Git to identify who did change the history of the repository whenever you are the user logged on to your computer.</li>
</ul>
<p>
- <img border="0" src="images/Egit-0.9-getstarted-email.png"/>
+ <img border="0" src="images/Egit-0.9-getstarted-email.png"/>
</p>
<p>
<img border="0" src="images/Egit-0.9-getstarted-name.png"/>
</p>
+ <h4 id="Setting_up_the_Home_Directory_on_Windows">Setting up the Home Directory on Windows</h4>
+ <p>Add the environment variable <code>HOME</code> to your user variables. 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> can cause follow-up problems!
+ </p>
+ <p>If the <code>HOME</code> variable is not defined the home directory will be calculated by concatenating <code>HOMEDRIVE</code> and <code>HOMEPATH</code>. </p>
+ <p>If both <code>HOME</code> and <code>HOMEDRIVE</code> are not defined <code>HOMESHARE</code> will be used.</p>
+ <p>EGit shows a warning if <code>HOME</code> is not defined:</p>
+ <p>
+ <img border="0" src="images/Egit_no_home.png"/>
+ </p>
<h3 id="Create_Repository">Create Repository</h3>
<ul>
<li>Create a new Java project <code>HelloWorld</code> </li>
@@ -99,24 +122,28 @@
<b>Team &gt; Add</b> on the project node
</li>
<li>The
- <i>+</i> decorators show that now the project's files have been added to version control
+ <i>+</i> decorators show that now the project's files have been added to version control
</li>
</ul>
<ul>
- <li>Create a file <code>.gitignore</code> in the project folder with the following content</li>
+ <li>Mark the "bin" folder as "ignored by Git", either by right-clicking on it and selecting
+ <b>Team &gt; Ignore</b> or by creating a file <code>.gitignore</code> in the project folder with the following content
+ </li>
</ul>
- <pre>bin
+ <pre>/bin
</pre>
<ul>
<li>This excludes the <code>bin</code> folder from Git's list of tracked files. </li>
- <li>Add <code>.gitignore</code> to version control. </li>
+ <li>Add <code>.gitignore</code> to version control (
+ <b>Team &gt; Add</b>):
+ </li>
</ul>
<p>
- <img border="0" src="images/Egit-0.9-getstarted-ignore-added.png"/>
+ <img border="0" src="images/Egit-0.11-getstarted-ignore-added.png"/>
</p>
<ul>
<li>Click
- <b>Team &gt; Commit</b> in the project context menu
+ <b>Team &gt; Commit</b> in the project context menu
</li>
<li>Enter a commit message explaining your change, the first line (followed by an empty line) will become the short log for this commit. By default the author and committer are taken from the <code>.gitconfig</code> file in your home directory. </li>
<li>You may click
@@ -125,26 +152,26 @@
</li>
<li>If you are committing the change of another author you may alter the author field to give the name and email address of the author. </li>
<li>Click
- <b>Commit</b> to commit your first change.
+ <b>Commit</b> to commit your first change.
</li>
</ul>
<p>
<img border="0" src="images/Egit-0.9-getstarted-commit.png"/>
</p>
<ul>
- <li>Note that the decorators of the committed files changed. </li>
+ <li>Note that the decorators of the committed files changed.</li>
</ul>
<p>
- <img border="0" src="images/Egit-0.9-getstarted-commited.png"/>
+ <img border="0" src="images/Egit-0.9-getstarted-commited.png"/>
</p>
<h3 id="Inspect_History">Inspect History</h3>
<ul>
<li>Click
- <b>Show In &gt; History</b> from the context menu to inspect the history of a resource
+ <b>Team &gt; Show in History</b> from the context menu to inspect the history of a resource
</li>
</ul>
<p>
- <img border="0" src="images/Egit-0.9-getstarted-history1.png"/>
+ <img border="0" src="images/Egit-0.11-getstarted-history1.png"/>
</p>
<ul>
<li>Create a new Java class <code>Hello.java</code> and implement it </li>
@@ -156,22 +183,20 @@
<img border="0" src="images/Egit-0.9-getstarted-application.png"/>
</p>
<p>
- <img border="0" src="images/Egit-0.9-getstarted-history2.png"/>
+ <img border="0" src="images/Egit-0.11-getstarted-history2.png"/>
</p>
<ul>
<li>Click the
- <b>Compare Mode</b> toggle button in the History View
+ <b>Compare Mode</b> toggle button in the History View
</li>
- <li>Double click <code>src/Hello.java</code> in the Resource History View to open your last committed change in the Compare View </li>
+ <li>Double click <code>src/Hello.java</code> in the Resource list of the History View to open your last committed change in the Compare View</li>
</ul>
<p>
- <img border="0" src="images/Egit-0.9-getstarted-compare.png"/>
+ <img border="0" src="images/Egit-0.11-getstarted-compare.png"/>
</p>
<p>
- <br/>
-
- <b>Congratulations, you just have mastered your first project using Git !</b>
-
+ <br/>
+ <b>Congratulations, you just have mastered your first project using Git&nbsp;!</b>
<br/>
<br/>
</p>
@@ -229,7 +254,7 @@
<h3 id="Push_Upstream">Push Upstream</h3>
<ul>
<li>Click
- <b>Team &gt; Push...</b> and copy and paste the SSH URL of your new github repository
+ <b>Team &gt; Remote &gt; Push...</b> and copy and paste the SSH URL of your new github repository
</li>
<li>If you are behind a firewall which doesn't allow SSH traffic use the github HTTPS URL instead and provide your github user and password instead of using the uploaded public SSH key. To store your credentials into the Eclipse secure store click
<b>Store in Secure Store</b>.
@@ -239,7 +264,7 @@
</li>
</ul>
<p>
- <img border="0" src="images/Egit-0.10-github-pushurl.png"/>
+ <img border="0" src="images/Egit-0.10-github-pushurl.png"/>
</p>
<ul>
<li>Click
@@ -265,7 +290,7 @@
</li>
</ul>
<p>
- <img border="0" src="images/Egit-0.10-github-push-preview.png"/>
+ <img border="0" src="images/Egit-0.10-github-push-preview.png"/>
</p>
<ul>
<li>Click
@@ -276,7 +301,7 @@
<li>The next dialog reports the result of the push operation.</li>
</ul>
<p>
- <img border="0" src="images/Egit-0.10-github-pushresult.png"/>
+ <img border="0" src="images/Egit-0.10-github-pushresult.png"/>
</p>
<ul>
<li>Point your browser at your GitHub repository to see that your new repository content has arrived</li>
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/03-CompareWith.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/03-CompareWith.png
deleted file mode 100644
index 24266ebe6..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/03-CompareWith.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/CreateBranch.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/CreateBranch.png
deleted file mode 100644
index b55f1298f..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/CreateBranch.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-project-menu.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-project-menu.png
deleted file mode 100644
index e605f25b5..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-project-menu.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-repoview-repomenu.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-repoview-repomenu.png
deleted file mode 100644
index 16bb78a13..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.10-repoview-repomenu.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-BranchCreationDialog.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-BranchCreationDialog.png
new file mode 100644
index 000000000..9551c7348
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-BranchCreationDialog.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-BranchCreationFromCommitDialog.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-BranchCreationFromCommitDialog.png
new file mode 100644
index 000000000..e52578208
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-BranchCreationFromCommitDialog.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-ConfigureFetchFromUpstream.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-ConfigureFetchFromUpstream.png
new file mode 100644
index 000000000..0460d2da9
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-ConfigureFetchFromUpstream.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-ConfigurePushToUpstream.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-ConfigurePushToUpstream.png
new file mode 100644
index 000000000..f6767b547
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-ConfigurePushToUpstream.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-ContentAssistGerritChange.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-ContentAssistGerritChange.png
new file mode 100644
index 000000000..2b00aeeb9
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-ContentAssistGerritChange.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-FetchResultDialog.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-FetchResultDialog.png
new file mode 100644
index 000000000..7a49c8cfa
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-FetchResultDialog.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-GitTreeCompareView.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-GitTreeCompareView.png
new file mode 100644
index 000000000..d4f877ff1
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-GitTreeCompareView.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-GitTreeCompareViewRepo.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-GitTreeCompareViewRepo.png
new file mode 100644
index 000000000..3e5d0821b
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-GitTreeCompareViewRepo.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-ImportProjectsFromRepoView.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-ImportProjectsFromRepoView.png
new file mode 100644
index 000000000..e850bd9df
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-ImportProjectsFromRepoView.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-PushResultDialog.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-PushResultDialog.png
new file mode 100644
index 000000000..1ae2bb901
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-PushResultDialog.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-RepoViewReferencesNode.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-RepoViewReferencesNode.png
new file mode 100644
index 000000000..30dcbdea7
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-RepoViewReferencesNode.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-RepoViewTopLevel.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-RepoViewTopLevel.png
new file mode 100644
index 000000000..904d32371
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-RepoViewTopLevel.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-activate-task.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-activate-task.png
new file mode 100644
index 000000000..32722d1fa
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-activate-task.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-clone-wizard-branch-page.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-clone-wizard-branch-page.png
new file mode 100644
index 000000000..37fc066b5
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-clone-wizard-branch-page.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-commit-using-template.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-commit-using-template.png
new file mode 100644
index 000000000..d5a584cf9
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-commit-using-template.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-configure-commit-template.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-configure-commit-template.png
new file mode 100644
index 000000000..96a7e1b21
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-configure-commit-template.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-fetchChangeFromGerritDialog.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-fetchChangeFromGerritDialog.png
new file mode 100644
index 000000000..d0d9e2c92
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-fetchChangeFromGerritDialog.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-getstarted-compare.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-getstarted-compare.png
new file mode 100644
index 000000000..618e8af3c
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-getstarted-compare.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-getstarted-history1.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-getstarted-history1.png
new file mode 100644
index 000000000..bf6c71388
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-getstarted-history1.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-getstarted-history2.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-getstarted-history2.png
new file mode 100644
index 000000000..f1f6855ba
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-getstarted-history2.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-getstarted-ignore-added.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-getstarted-ignore-added.png
new file mode 100644
index 000000000..d6a49840f
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-getstarted-ignore-added.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-import-projects-add-dialog.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-import-projects-add-dialog.png
new file mode 100644
index 000000000..cb331da13
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-import-projects-add-dialog.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-import-projects-filled-list.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-import-projects-filled-list.png
new file mode 100644
index 000000000..f2ba3790f
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-import-projects-filled-list.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-import-projects-select-wizard.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-import-projects-select-wizard.png
new file mode 100644
index 000000000..dd29bc532
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-import-projects-select-wizard.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-initialConfigurationDialog.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-initialConfigurationDialog.png
new file mode 100644
index 000000000..6ca019ee5
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-initialConfigurationDialog.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-project-menu.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-project-menu.png
new file mode 100644
index 000000000..00a179b3f
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-project-menu.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-repoview-repomenu.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-repoview-repomenu.png
new file mode 100644
index 000000000..f903b562d
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-repoview-repomenu.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-workbench-menu.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-workbench-menu.png
new file mode 100644
index 000000000..9c28b3d21
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-workbench-menu.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-workbench-toolbar.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-workbench-toolbar.png
new file mode 100644
index 000000000..c6f2abed5
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-workbench-toolbar.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-clone-wizard-branch-page.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-clone-wizard-branch-page.png
deleted file mode 100644
index c3ebb170f..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-clone-wizard-branch-page.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-compare.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-compare.png
deleted file mode 100644
index bf70fb2e7..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-compare.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-create-project.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-create-project.png
index f2d07524e..6fb5dd1a3 100644
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-create-project.png
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-create-project.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-history1.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-history1.png
deleted file mode 100644
index 99d06c7f0..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-history1.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-history2.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-history2.png
deleted file mode 100644
index f24c231ac..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-history2.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-ignore-added.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-ignore-added.png
deleted file mode 100644
index d89ff3e04..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-ignore-added.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-project-created.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-project-created.png
index 5b636d8b9..92fa22932 100644
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-project-created.png
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-project-created.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-share.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-share.png
index b07ad9472..67de6c67b 100644
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-share.png
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-getstarted-share.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-contextMenuFolder.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-contextMenuFolder.png
index a4b5d20e4..7886b5639 100644
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-contextMenuFolder.png
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-contextMenuFolder.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-contextMenuSingleFile.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-contextMenuSingleFile.png
index 87866cafe..c200f7df9 100644
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-contextMenuSingleFile.png
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-contextMenuSingleFile.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-contextMenuTwoFiles.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-contextMenuTwoFiles.png
index aad2ca23a..d481c6f50 100644
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-contextMenuTwoFiles.png
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-history-view-contextMenuTwoFiles.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-add-dialog.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-add-dialog.png
deleted file mode 100644
index b99041e3b..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-add-dialog.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-filled-list.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-filled-list.png
deleted file mode 100644
index ef2625098..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-filled-list.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-select-wizard.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-select-wizard.png
deleted file mode 100644
index fbc0cdc55..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-select-wizard.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-share-manually.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-share-manually.png
deleted file mode 100644
index a43ad6979..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.9-import-projects-share-manually.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit_no_home.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit_no_home.png
new file mode 100644
index 000000000..e76cf69ad
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit_no_home.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrCreateBranch.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrCreateBranch.png
deleted file mode 100644
index 6ddbdaab7..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrCreateBranch.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrImportNodes.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrImportNodes.png
deleted file mode 100644
index 0390188e5..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrImportNodes.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrSearchDialog.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrSearchDialog.png
deleted file mode 100644
index 787c12ef6..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrSearchDialog.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrTopLevelNodes.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrTopLevelNodes.png
deleted file mode 100644
index 02f616522..000000000
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/RepoMgrTopLevelNodes.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/0.10.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/0.10.html
deleted file mode 100644
index c1fef6ba3..000000000
--- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/0.10.html
+++ /dev/null
@@ -1,50 +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 0.10 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 0.10 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="HTTP-basic-and-digest-authentication.html" title="HTTP basic and digest authentication">
- <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">HTTP basic and digest authentication</td>
- </tr>
- </table><hr/>
- <h1 id="Histogram_Diff">Histogram Diff</h1>
- <p>A new histogram diff algorithm derived from
- <a href="http://bramcohen.livejournal.com/73318.html" target="egit_external">Bram Cohen's Patience Diff algorithm</a> has been implemented which yields better readable diffs for real-world source code diffs.
- </p>
- <p>See the <code>HistogramDiff</code> class.</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="HTTP-basic-and-digest-authentication.html" title="HTTP basic and digest authentication">
- <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">HTTP basic and digest authentication</td>
- </tr>
- </table>
- </body>
-</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/Git-Porcelain-API-Updates.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/Git-Porcelain-API-Updates.html
deleted file mode 100644
index 17358dd05..000000000
--- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/Git-Porcelain-API-Updates.html
+++ /dev/null
@@ -1,75 +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 0.10 New and Noteworthy - Git Porcelain API Updates</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">Git Porcelain API Updates</th>
- </tr>
- <tr>
- <td style="width: 20%" align="left">
- <a href="Performance-New-IndexDiffFilter.html" title="Performance: New IndexDiffFilter">
- <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="User-Guide.html" title="User Guide">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">Performance: New IndexDiffFilter</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">User Guide</td>
- </tr>
- </table><hr/>
- <h1 id="Git_Porcelain_API_Updates">Git Porcelain API Updates</h1>
- <p>More Git porcelain commands were added to the
- <b>org.eclipse.jgit.api</b> package
- </p>
- <ul>
- <li><code>CheckoutCommand</code></li>
- <li><code>CherryPickCommand</code></li>
- <li><code>CreateBranchCommand</code></li>
- <li><code>DeleteBranchCommand</code></li>
- <li><code>FetchCommand</code></li>
- <li><code>InitCommand</code></li>
- <li><code>ListBranchCommand</code></li>
- <li><code>PullCommand</code></li>
- <li><code>PushCommand</code></li>
- <li><code>RebaseCommand</code></li>
- <li><code>RenameBranchCommand</code></li>
- <li><code>RmCommand</code></li>
- </ul><hr/>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <td style="width: 20%" align="left">
- <a href="Performance-New-IndexDiffFilter.html" title="Performance: New IndexDiffFilter">
- <img alt="Previous" border="0" src="../../../images/prev.gif"/>
- </a>
- </td>
- <td style="width: 60%" align="center">
- <a href="0.10.html" title="JGit 0.10 New and Noteworthy">
- <img alt="JGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/>
- </a>
- </td>
- <td style="width: 20%" align="right">
- <a href="User-Guide.html" title="User Guide">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">Performance: New IndexDiffFilter</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">User Guide</td>
- </tr>
- </table>
- </body>
-</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/HTTP-basic-and-digest-authentication.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/HTTP-basic-and-digest-authentication.html
deleted file mode 100644
index 34028a812..000000000
--- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/HTTP-basic-and-digest-authentication.html
+++ /dev/null
@@ -1,61 +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 0.10 New and Noteworthy - HTTP basic and digest authentication</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">HTTP basic and digest authentication</th>
- </tr>
- <tr>
- <td style="width: 20%" align="left">
- <a href="0.10.html" title="JGit 0.10 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-New-IndexDiffFilter.html" title="Performance: New IndexDiffFilter">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">JGit 0.10 New and Noteworthy</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Performance: New IndexDiffFilter</td>
- </tr>
- </table><hr/>
- <h1 id="HTTP_basic_and_digest_authentication">HTTP basic and digest authentication</h1>
- <p>We natively support the HTTP basic and digest authentication methods
- by setting the Authorization header.</p>
- <p>See the <code>HttpAuthMethod</code> class.</p><hr/>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <td style="width: 20%" align="left">
- <a href="0.10.html" title="JGit 0.10 New and Noteworthy">
- <img alt="Previous" border="0" src="../../../images/prev.gif"/>
- </a>
- </td>
- <td style="width: 60%" align="center">
- <a href="0.10.html" title="JGit 0.10 New and Noteworthy">
- <img alt="JGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/>
- </a>
- </td>
- <td style="width: 20%" align="right">
- <a href="Performance-New-IndexDiffFilter.html" title="Performance: New IndexDiffFilter">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">JGit 0.10 New and Noteworthy</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Performance: New IndexDiffFilter</td>
- </tr>
- </table>
- </body>
-</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/Performance-New-IndexDiffFilter.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/Performance-New-IndexDiffFilter.html
deleted file mode 100644
index 4d276243b..000000000
--- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/Performance-New-IndexDiffFilter.html
+++ /dev/null
@@ -1,60 +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 0.10 New and Noteworthy - Performance: New IndexDiffFilter</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: New IndexDiffFilter</th>
- </tr>
- <tr>
- <td style="width: 20%" align="left">
- <a href="HTTP-basic-and-digest-authentication.html" title="HTTP basic and digest authentication">
- <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="Git-Porcelain-API-Updates.html" title="Git Porcelain API Updates">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">HTTP basic and digest authentication</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Git Porcelain API Updates</td>
- </tr>
- </table><hr/>
- <h1 id="Performance:_New_IndexDiffFilter">Performance: New IndexDiffFilter</h1>
- <p>The new IndexDiffFilter speeds up walking the working tree heavily. This e.g. helps to bring up the commit dialog on large repositories much faster.</p>
- <p>See the <code>IndexDiffFilter</code> class.</p><hr/>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <td style="width: 20%" align="left">
- <a href="HTTP-basic-and-digest-authentication.html" title="HTTP basic and digest authentication">
- <img alt="Previous" border="0" src="../../../images/prev.gif"/>
- </a>
- </td>
- <td style="width: 60%" align="center">
- <a href="0.10.html" title="JGit 0.10 New and Noteworthy">
- <img alt="JGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/>
- </a>
- </td>
- <td style="width: 20%" align="right">
- <a href="Git-Porcelain-API-Updates.html" title="Git Porcelain API Updates">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">HTTP basic and digest authentication</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Git Porcelain API Updates</td>
- </tr>
- </table>
- </body>
-</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/0.10.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.11/0.11.html
index 782b1cb8a..f5bd8e44f 100644
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/0.10.html
+++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.11/0.11.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>EGit 0.10 New and Noteworthy</title>
+ <title>JGit 0.11 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 0.10 New and Noteworthy</th>
+ <th style="width: 100%" align="center" colspan="3">JGit 0.11 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="Rebase-Support.html" title="Rebase Support">
+ <a href="Features.html" title="Features">
<img alt="Next" border="0" src="../../../images/next.gif"/>
</a>
</td>
@@ -22,19 +22,24 @@
<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">Rebase Support</td>
+ <td style="width: 20%" align="right" valign="top">Features</td>
</tr>
</table><hr/>
- <h1 id="Pull_Support">Pull Support</h1>
- <p>EGit now supports
- <a href="../../../EGit/User_Guide/Tasks.html#Pulling_New_Changes_from_Upstream_Repositories" title="EGit/User_Guide#Pulling_New_Changes_from_Upstream_Repositories">Pull</a> for branches which are configured to track remote branches. When local branches are created based on a remote tracking branch EGit will automatically establish a tracking relationship.
- </p><hr/>
+ <h1 id="Git_Porcelain_API_Updates">Git Porcelain API Updates</h1>
+ <p>More Git porcelain commands were added to the
+ <b>org.eclipse.jgit.api</b> package
+ </p>
+ <ul>
+ <li><code>RevertCommand</code></li>
+ <li><code>CloneCommand</code></li>
+ <li><code>PullCommand</code> now supports rebase</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="Rebase-Support.html" title="Rebase Support">
+ <a href="Features.html" title="Features">
<img alt="Next" border="0" src="../../../images/next.gif"/>
</a>
</td>
@@ -42,7 +47,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">Rebase Support</td>
+ <td style="width: 20%" align="right" valign="top">Features</td>
</tr>
</table>
</body>
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/Bugs-Closed.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.11/Bugs-Closed.html
index 0b4997abb..5943dc242 100644
--- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/Bugs-Closed.html
+++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.11/Bugs-Closed.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 0.10 New and Noteworthy - Bugs Closed</title>
+ <title>JGit 0.11 New and Noteworthy - Bugs Closed</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="User-Guide.html" title="User Guide">
+ <a href="Features.html" title="Features">
<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">User Guide</td>
+ <td style="width: 20%" align="left" valign="top">Features</td>
<td style="width: 60%" align="center"></td>
<td style="width: 20%" align="right" valign="top">Commits</td>
</tr>
</table><hr/>
<h1 id="Bugs_Closed">Bugs Closed</h1>
<p>
- <a href="https://bugs.eclipse.org/bugs/buglist.cgi?chfieldto=2010-12-15;query_format=advanced;chfield=bug_status;chfieldfrom=2010-09-23;bug_status=RESOLVED;bug_status=CLOSED;resolution=FIXED;classification=Technology;product=JGit" target="egit_external">31 JGit Bugs</a> have been closed since 0.9
+ <a href="https://bugs.eclipse.org/bugs/buglist.cgi?chfieldto=2011-02-10;query_format=advanced;chfield=bug_status;chfieldfrom=2010-12-18;chfieldvalue=resolved;resolution=FIXED;resolution=DUPLICATE;product=JGit;classification=Technology" target="egit_external">12 bugs and 4 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="User-Guide.html" title="User Guide">
+ <a href="Features.html" title="Features">
<img alt="Previous" border="0" src="../../../images/prev.gif"/>
</a>
</td>
<td style="width: 60%" align="center">
- <a href="0.10.html" title="JGit 0.10 New and Noteworthy">
- <img alt="JGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ <a href="0.11.html" title="JGit 0.11 New and Noteworthy">
+ <img alt="JGit 0.11 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">User Guide</td>
+ <td style="width: 20%" align="left" valign="top">Features</td>
<td style="width: 60%" align="center"></td>
<td style="width: 20%" align="right" valign="top">Commits</td>
</tr>
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/Commits.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.11/Commits.html
index 137b7aa0a..13a6b8345 100644
--- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/Commits.html
+++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.11/Commits.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 0.10 New and Noteworthy - Commits</title>
+ <title>JGit 0.11 New and Noteworthy - Commits</title>
<link type="text/css" rel="stylesheet" href="../../../book.css"/>
</head>
<body>
@@ -31,7 +31,7 @@
</table><hr/>
<h1 id="Commits">Commits</h1>
<p>
- <a href="http://egit.eclipse.org/w/?p=jgit.git;a=shortlog;h=stable-0.10;hp=v0.9.3;opt=--no-merges" target="egit_external">JGit 0.10 - commits in gitweb</a>
+ <a href="http://egit.eclipse.org/w/?p=jgit.git;a=shortlog;h=stable-0.11;hp=v0.10.1;opt=--no-merges" target="egit_external">JGit 0.11 - commits in gitweb</a>
</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="0.10.html" title="JGit 0.10 New and Noteworthy">
- <img alt="JGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ <a href="0.11.html" title="JGit 0.11 New and Noteworthy">
+ <img alt="JGit 0.11 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/0.10/User-Guide.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.11/Features.html
index 5fbec4fd0..7f5cfe4b2 100644
--- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/User-Guide.html
+++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.11/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 0.10 New and Noteworthy - User Guide</title>
+ <title>JGit 0.11 New and Noteworthy - 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">User Guide</th>
+ <th style="width: 100%" align="center" colspan="3">Features</th>
</tr>
<tr>
<td style="width: 20%" align="left">
- <a href="Git-Porcelain-API-Updates.html" title="Git Porcelain API Updates">
+ <a href="0.11.html" title="JGit 0.11 New and Noteworthy">
<img alt="Previous" border="0" src="../../../images/prev.gif"/>
</a>
</td>
@@ -24,25 +24,38 @@
</td>
</tr>
<tr>
- <td style="width: 20%" align="left" valign="top">Git Porcelain API Updates</td>
+ <td style="width: 20%" align="left" valign="top">JGit 0.11 New and Noteworthy</td>
<td style="width: 60%" align="center"></td>
<td style="width: 20%" align="right" valign="top">Bugs Closed</td>
</tr>
</table><hr/>
- <h1 id="User_Guide">User Guide</h1>
- <p>The
- <a href="../../../JGit/User_Guide/User-Guide.html" title="JGit/User_Guide">User Guide</a> has been enhanced.
- </p><hr/>
+ <h1 id="Features">Features</h1>
+ <h2 id="Support_for_self_signed_certificate_.28HTTPS.29">Support for self signed certificate (HTTPS)</h2>
+ <p>Added possibility to disable ssl verification, just as is possible with git
+ using: <code>git config --global http.sslVerify false</code></p>
+ <p>To enable the feature, configure
+
+ <b>Window &gt; Preferences &gt; Team &gt; Git &gt; Configuration</b>
+ and add a new key/value: <code>http.sslVerify=false</code>
+ </p>
+ <h2 id="Note_Support">Note Support</h2>
+ <ul>
+ <li>Merging of git notes was implemented</li>
+ </ul>
+ <h2 id="Configuration">Configuration</h2>
+ <ul>
+ <li>Support for system-wide git configuration was added</li>
+ </ul><hr/>
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
<tr>
<td style="width: 20%" align="left">
- <a href="Git-Porcelain-API-Updates.html" title="Git Porcelain API Updates">
+ <a href="0.11.html" title="JGit 0.11 New and Noteworthy">
<img alt="Previous" border="0" src="../../../images/prev.gif"/>
</a>
</td>
<td style="width: 60%" align="center">
- <a href="0.10.html" title="JGit 0.10 New and Noteworthy">
- <img alt="JGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ <a href="0.11.html" title="JGit 0.11 New and Noteworthy">
+ <img alt="JGit 0.11 New and Noteworthy" border="0" src="../../../images/home.gif"/>
</a>
</td>
<td style="width: 20%" align="right">
@@ -52,7 +65,7 @@
</td>
</tr>
<tr>
- <td style="width: 20%" align="left" valign="top">Git Porcelain API Updates</td>
+ <td style="width: 20%" align="left" valign="top">JGit 0.11 New and Noteworthy</td>
<td style="width: 60%" align="center"></td>
<td style="width: 20%" align="right" valign="top">Bugs Closed</td>
</tr>
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/Updating-This-Document.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.11/Updating-This-Document.html
index 7b82adc75..059198e28 100644
--- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.10/Updating-This-Document.html
+++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/0.11/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 0.10 New and Noteworthy - Updating This Document</title>
+ <title>JGit 0.11 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/0.10" target="egit_external">http://wiki.eclipse.org/JGit/New_and_Noteworthy/0.10</a>
+ <a href="http://wiki.eclipse.org/JGit/New_and_Noteworthy/0.11" target="egit_external">http://wiki.eclipse.org/JGit/New_and_Noteworthy/0.11</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="0.10.html" title="JGit 0.10 New and Noteworthy">
- <img alt="JGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ <a href="0.11.html" title="JGit 0.11 New and Noteworthy">
+ <img alt="JGit 0.11 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/JGit/User_Guide/Advanced-Topics.html b/org.eclipse.egit.doc/help/JGit/User_Guide/Advanced-Topics.html
index e39512b85..b0f84156e 100644
--- a/org.eclipse.egit.doc/help/JGit/User_Guide/Advanced-Topics.html
+++ b/org.eclipse.egit.doc/help/JGit/User_Guide/Advanced-Topics.html
@@ -45,14 +45,15 @@
commits necessary for it to answer you, and will try to avoid looking
back further in history. That reduces the size of the internal object
map, and thus reduces overall memory usage.</p>
- <p>&lt;source lang="java"&gt;
- RevWalk walk = new RevWalk(repository);
- ObjectId from = repository.resolve("refs/heads/master");
- ObjectId to = repository.resolve("refs/remotes/origin/master");</p>
- <p>walk.markStart(walk.parseCommit(from));
- walk.markUninteresting(walk.parseCommit(to));</p>
- <p>// ...
- &lt;/source&gt;</p>
+ <pre>RevWalk walk = new RevWalk(repository);
+ObjectId from = repository.resolve("refs/heads/master");
+ObjectId to = repository.resolve("refs/remotes/origin/master");
+</pre>
+ <pre>walk.markStart(walk.parseCommit(from));
+walk.markUninteresting(walk.parseCommit(to));
+</pre>
+ <pre>// ...
+</pre>
<h3 id="Discard_the_body_of_a_commit">Discard the body of a commit</h3>
<p>There is a setRetainBody(false) method you can use to discard the body
of a commit if you don't need the author, committer or message
@@ -60,11 +61,10 @@
this data is when you are only using the RevWalk to compute the merge
base between branches, or to perform a task you would have used `git
rev-list` with its default formatting for.</p>
- <p>&lt;source lang="java"&gt;
- RevWalk walk = new RevWalk(repository);
- walk.setRetainBody(false);
- // ...
- &lt;/source&gt;</p>
+ <pre>RevWalk walk = new RevWalk(repository);
+walk.setRetainBody(false);
+// ...
+</pre>
<p>If you do need the body, consider extracting the data you need and
then calling dispose() on the RevCommit, assuming you only need the
data once and can then discard it. If you need to hang onto the data,
@@ -73,16 +73,17 @@
full message. This is because JGit uses a byte[] internally to store the
message in UTF-8. Java String storage would be bigger using UTF-16,
assuming the message is mostly US-ASCII data.</p>
- <p>&lt;source lang="java"&gt;
- RevWalk walk = new RevWalk(repository);
- // more setup
- Set&lt;String&gt; authorEmails = new HashSet&lt;String&gt;();</p>
- <p>for (RevCommit commit : walk) {
- // extract the commit fields you need, for example:
- authorEmails.add(commit.getAuthorIdent().getEmailAddress());</p>
- <p> commit.dispose();
- }
- &lt;/source&gt;</p>
+ <pre>RevWalk walk = new RevWalk(repository);
+// more setup
+Set&lt;String&gt; authorEmails = new HashSet&lt;String&gt;();
+</pre>
+ <pre>for (RevCommit commit : walk) {
+ // extract the commit fields you need, for example:
+ authorEmails.add(commit.getAuthorIdent().getEmailAddress());
+</pre>
+ <pre> commit.dispose();
+}
+</pre>
<h3 id="Subclassing_RevWalk_and_RevCommit">Subclassing RevWalk and RevCommit</h3>
<p>If you need to attach additional data to a commit, consider
subclassing both RevWalk and RevCommit, and using the createCommit()
@@ -90,33 +91,41 @@
Put the additional data as fields in your RevCommit subclass, so that
you don't need to use an auxiliary HashMap to translate from RevCommit
or ObjectId to your additional data fields.</p>
- <p>&lt;source lang="java"&gt;
- public class ReviewedRevision extends RevCommit {</p>
- <p> private final Date reviewDate;</p>
- <p> private ReviewedRevision(AnyObjectId id, Date reviewDate) {
- super(id);
- this.reviewDate = reviewDate;
- }</p>
- <p> public List&lt;String&gt; getReviewedBy() {
- return getFooterLines("Reviewed-by");
- }</p>
- <p> public Date getReviewDate() {
- return reviewDate;
- }</p>
- <p> public static class Walk extends RevWalk {</p>
- <p> public Walk(Repository repo) {
- super(repo);
- }</p>
- <p> @Override
- protected RevCommit createCommit(AnyObjectId id) {
- return new ReviewedRevision(id, getReviewDate(id));
- }</p>
- <p> private Date getReviewDate(AnyObjectId id) {
- // ...
- }</p>
- <p> }
- }
- &lt;/source&gt;</p>
+ <pre>public class ReviewedRevision extends RevCommit {
+</pre>
+ <pre> private final Date reviewDate;
+</pre>
+ <pre> private ReviewedRevision(AnyObjectId id, Date reviewDate) {
+ super(id);
+ this.reviewDate = reviewDate;
+ }
+</pre>
+ <pre> public List&lt;String&gt; getReviewedBy() {
+ return getFooterLines("Reviewed-by");
+ }
+</pre>
+ <pre> public Date getReviewDate() {
+ return reviewDate;
+ }
+</pre>
+ <pre> public static class Walk extends RevWalk {
+</pre>
+ <pre> public Walk(Repository repo) {
+ super(repo);
+ }
+</pre>
+ <pre> @Override
+ protected RevCommit createCommit(AnyObjectId id) {
+ return new ReviewedRevision(id, getReviewDate(id));
+ }
+</pre>
+ <pre> private Date getReviewDate(AnyObjectId id) {
+ // ...
+ }
+</pre>
+ <pre> }
+}
+</pre>
<h3 id="Cleaning_up_after_a_revision_walk">Cleaning up after a revision walk</h3>
<p>A RevWalk cannot shrink its internal object map. If you have just
done a huge traversal of say all history of the repository, that will
@@ -128,14 +137,13 @@
much faster than building a new one from scratch. So you need to
balance the reclaiming of memory against the user's desire to perform
fast updates of an existing repository view.</p>
- <p>&lt;source lang="java"&gt;
- RevWalk walk = new RevWalk(repository);
- // ...
- for (RevCommit commit : walk) {
- // ...
- }
- walk.dispose();
- &lt;/source&gt;</p><hr/>
+ <pre>RevWalk walk = new RevWalk(repository);
+// ...
+for (RevCommit commit : walk) {
+ // ...
+}
+walk.dispose();
+</pre><hr/>
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
<tr>
<td style="width: 20%" align="left">
diff --git a/org.eclipse.egit.doc/help/JGit/User_Guide/Concepts.html b/org.eclipse.egit.doc/help/JGit/User_Guide/Concepts.html
index f617b133d..7ee7e0a64 100644
--- a/org.eclipse.egit.doc/help/JGit/User_Guide/Concepts.html
+++ b/org.eclipse.egit.doc/help/JGit/User_Guide/Concepts.html
@@ -38,13 +38,12 @@
<p>To build a repository, you invoke flavors of
<b>RepositoryBuilder</b>.
</p>
- <p>&lt;source lang="java"&gt;
- FileRepositoryBuilder builder = new RepositoryBuilder();
- Repository repository = builder.setGitDir("/my/git/directory")
- .readEnvironment() // scan environment GIT_* variables
- .findGitDir() // scan up the file system tree
- .build();
- &lt;/source&gt;</p>
+ <pre>FileRepositoryBuilder builder = new RepositoryBuilder();
+Repository repository = builder.setGitDir("/my/git/directory")
+.readEnvironment() // scan environment GIT_* variables
+.findGitDir() // scan up the file system tree
+.build();
+</pre>
<h3 id="Git_Objects">Git Objects</h3>
<p>All objects are represented by a SHA-1 id in the Git object model. In JGit, this is represented by the
<b>AnyObjectId</b> and
@@ -74,22 +73,19 @@
</li>
</ul>
<p>To resolve an object from a repository, simply pass in the right revision string.</p>
- <p>&lt;source lang="java"&gt;
- ObjectId head = repository.resolve("HEAD");
- &lt;/source&gt;</p>
+ <pre>ObjectId head = repository.resolve("HEAD");
+</pre>
<h3 id="Ref">Ref</h3>
<p>A ref is a variable that holds a single object identifier. The object identifier can be any valid Git object (blob, tree, commit, tag).</p>
<p>For example, to query for the reference to head, you can simply call</p>
- <p>&lt;source lang="java"&gt;
- Ref HEAD = repository.getRef("refs/heads/master");
- &lt;/source&gt;</p>
+ <pre>Ref HEAD = repository.getRef("refs/heads/master");
+</pre>
<h3 id="RevWalk">RevWalk</h3>
<p>A
<b>RevWalk</b> walks a commit graph and produces the matching commits in order.
</p>
- <p>&lt;source lang="java"&gt;
- RevWalk walk = new RevWalk(repository);
- &lt;/source&gt;</p>
+ <pre>RevWalk walk = new RevWalk(repository);
+</pre>
<p>TODO talk about filters</p>
<h3 id="RevCommit">RevCommit</h3>
<p>A
@@ -98,10 +94,9 @@
<p>To parse a commit, simply use a
<b>RevWalk</b> instance:
</p>
- <p>&lt;source lang="java"&gt;
- RevWalk walk = new RevWalk(repository);
- RevCommit commit = walk.parseCommit(objectIdOfCommit);
- &lt;/source&gt;</p>
+ <pre>RevWalk walk = new RevWalk(repository);
+RevCommit commit = walk.parseCommit(objectIdOfCommit);
+</pre>
<h3 id="RevTag">RevTag</h3>
<p>A
<b>RevTag</b> represents a tag in the Git object model.
@@ -109,10 +104,9 @@
<p>To parse a tag, simply use a
<b>RevWalk</b> instance:
</p>
- <p>&lt;source lang="java"&gt;
- RevWalk walk = new RevWalk(repository);
- RevTag tag = walk.parseTag(objectIdOfTag);
- &lt;/source&gt;</p>
+ <pre>RevWalk walk = new RevWalk(repository);
+RevTag tag = walk.parseTag(objectIdOfTag);
+</pre>
<h3 id="RevTree">RevTree</h3>
<p>A
<b>RevTree</b> represents a tree in the Git object model.
@@ -120,10 +114,9 @@
<p>To parse a commit, simply use a
<b>RevWalk</b> instance:
</p>
- <p>&lt;source lang="java"&gt;
- RevWalk walk = new RevWalk(repository);
- RevTree tree = walk.parseTree(objectIdOfTree);
- &lt;/source&gt;</p><hr/>
+ <pre>RevWalk walk = new RevWalk(repository);
+RevTree tree = walk.parseTree(objectIdOfTree);
+</pre><hr/>
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
<tr>
<td style="width: 20%" align="left">
diff --git a/org.eclipse.egit.doc/help/JGit/User_Guide/Reference.html b/org.eclipse.egit.doc/help/JGit/User_Guide/Reference.html
index 74e5e6098..28d2efcd1 100644
--- a/org.eclipse.egit.doc/help/JGit/User_Guide/Reference.html
+++ b/org.eclipse.egit.doc/help/JGit/User_Guide/Reference.html
@@ -41,11 +41,10 @@
<li>addFilepattern()</li>
</ul>
<p>Here's a quick example of how to add a set of files to the index using the porcelain API.</p>
- <p>&lt;source lang="java"&gt;
- Git git = new Git(db);
- AddCommand add = git.add();
- add.addFilepattern("someDirectory").call();
- &lt;/source&gt;</p>
+ <pre>Git git = new Git(db);
+AddCommand add = git.add();
+add.addFilepattern("someDirectory").call();
+</pre>
<h3 id="CommitCommand_.28git-commit.29">CommitCommand (git-commit)</h3>
<p>CommitCommand allows you to perform commits and has options available via its setter methods.</p>
<ul>
@@ -54,11 +53,10 @@
<li>setAll()</li>
</ul>
<p>Here's a quick example of how to commit using the porcelain API.</p>
- <p>&lt;source lang="java"&gt;
- Git git = new Git(db);
- CommitCommand commit = git.commit();
- commit.setMessage("initial commit").call();
- &lt;/source&gt;</p>
+ <pre>Git git = new Git(db);
+CommitCommand commit = git.commit();
+commit.setMessage("initial commit").call();
+</pre>
<h3 id="TagCommand_.28git-tag.29">TagCommand (git-tag)</h3>
<p>TagCommand supports a variety of tagging options through its setter methods.</p>
<ul>
@@ -70,11 +68,10 @@
<li>setSigned() - not supported yet, will throw exception</li>
</ul>
<p>Here's a quick example of how to tag a commit using the porcelain API.</p>
- <p>&lt;source lang="java"&gt;
- Git git = new Git(db);
- RevCommit commit = git.commit().setMessage("initial commit").call();
- RevTag tag = git.tag().setName("tag").call();
- &lt;/source&gt;</p>
+ <pre>Git git = new Git(db);
+RevCommit commit = git.commit().setMessage("initial commit").call();
+RevTag tag = git.tag().setName("tag").call();
+</pre>
<h3 id="LogCommand_.28git-log.29">LogCommand (git-log)</h3>
<p>LogCommand allows you to easily walk a commit graph.</p>
<ul>
@@ -82,10 +79,9 @@
<li>addRange(AnyObjectId since, AnyObjectId until)</li>
</ul>
<p>Here's a quick example of how get some log messages.</p>
- <p>&lt;source lang="java"&gt;
- Git git = new Git(db);
- LogCommand log = git.log().call();
- &lt;/source&gt;</p>
+ <pre>Git git = new Git(db);
+LogCommand log = git.log().call();
+</pre>
<h3 id="MergeCommand_.28git-merge.29">MergeCommand (git-merge)</h3>
<p>TODO</p><hr/>
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
diff --git a/org.eclipse.egit.doc/help/images/next.gif b/org.eclipse.egit.doc/help/images/next.gif
index e2f8c3e1f..2e9b1cc3d 100644
--- a/org.eclipse.egit.doc/help/images/next.gif
+++ b/org.eclipse.egit.doc/help/images/next.gif
Binary files differ
diff --git a/org.eclipse.egit.doc/help/images/prev.gif b/org.eclipse.egit.doc/help/images/prev.gif
index 4fb415010..350ccdc58 100644
--- a/org.eclipse.egit.doc/help/images/prev.gif
+++ b/org.eclipse.egit.doc/help/images/prev.gif
Binary files differ
diff --git a/org.eclipse.egit.doc/help/toc.xml b/org.eclipse.egit.doc/help/toc.xml
index 97a42e627..b81f3b48e 100644
--- a/org.eclipse.egit.doc/help/toc.xml
+++ b/org.eclipse.egit.doc/help/toc.xml
@@ -4,7 +4,10 @@
<topic href="help/EGit/User_Guide/User-Guide.html" label="Getting Started">
<topic href="help/EGit/User_Guide/User-Guide.html#Overview" label="Overview"></topic>
<topic href="help/EGit/User_Guide/User-Guide.html#Basic_Tutorial:_Adding_a_project_to_version_control" label="Basic Tutorial: Adding a project to version control">
- <topic href="help/EGit/User_Guide/User-Guide.html#Configuration" label="Configuration"></topic>
+ <topic href="help/EGit/User_Guide/User-Guide.html#Configuration" label="Configuration">
+ <topic href="help/EGit/User_Guide/User-Guide.html#Identifying_yourself" label="Identifying yourself"></topic>
+ <topic href="help/EGit/User_Guide/User-Guide.html#Setting_up_the_Home_Directory_on_Windows" label="Setting up the Home Directory on Windows"></topic>
+ </topic>
<topic href="help/EGit/User_Guide/User-Guide.html#Create_Repository" label="Create Repository"></topic>
<topic href="help/EGit/User_Guide/User-Guide.html#Track_Changes" label="Track Changes"></topic>
<topic href="help/EGit/User_Guide/User-Guide.html#Inspect_History" label="Inspect History"></topic>
@@ -34,18 +37,14 @@
<topic href="help/EGit/User_Guide/Tasks.html#Adding_a_Repository" label="Adding a Repository"></topic>
</topic>
<topic href="help/EGit/User_Guide/Tasks.html#Selecting_a_Repository_from_the_List" label="Selecting a Repository from the List"></topic>
- <topic href="help/EGit/User_Guide/Tasks.html#Method_for_importing_Projects" label="Method for importing Projects">
+ <topic href="help/EGit/User_Guide/Tasks.html#Importing_projects" label="Importing projects"></topic>
+ <topic href="help/EGit/User_Guide/Tasks.html#Wizard_for_project_import" label="Wizard for project import">
<topic href="help/EGit/User_Guide/Tasks.html#Import_Existing_Projects" label="Import Existing Projects">
<topic href="help/EGit/User_Guide/Tasks.html#Limiting_the_Scope_for_Project_Import" label="Limiting the Scope for Project Import"></topic>
</topic>
<topic href="help/EGit/User_Guide/Tasks.html#Use_the_New_Projects_Wizard" label="Use the New Projects Wizard"></topic>
<topic href="help/EGit/User_Guide/Tasks.html#Import_as_General_Project" label="Import as General Project"></topic>
</topic>
- <topic href="help/EGit/User_Guide/Tasks.html#Method_for_Sharing_Imported_Projects" label="Method for Sharing Imported Projects">
- <topic href="help/EGit/User_Guide/Tasks.html#Try_to_Share_Newly_Created_Projects_Automatically" label="Try to Share Newly Created Projects Automatically"></topic>
- <topic href="help/EGit/User_Guide/Tasks.html#Share_New_Projects_Interactively" label="Share New Projects Interactively"></topic>
- <topic href="help/EGit/User_Guide/Tasks.html#Do_Not_Share_New_Projects" label="Do Not Share New Projects"></topic>
- </topic>
</topic>
<topic href="help/EGit/User_Guide/Tasks.html#Working_with_remote_Repositories" label="Working with remote Repositories">
<topic href="help/EGit/User_Guide/Tasks.html#Cloning_Remote_Repositories" label="Cloning Remote Repositories">
@@ -54,6 +53,9 @@
<topic href="help/EGit/User_Guide/Tasks.html#Local_Destination" label="Local Destination"></topic>
</topic>
<topic href="help/EGit/User_Guide/Tasks.html#Pushing_to_other_Repositories" label="Pushing to other Repositories">
+ <topic href="help/EGit/User_Guide/Tasks.html#Pushing_to_upstream" label="Pushing to upstream">
+ <topic href="help/EGit/User_Guide/Tasks.html#Configuring_upstream_push" label="Configuring upstream push"></topic>
+ </topic>
<topic href="help/EGit/User_Guide/Tasks.html#Direct_Push" label="Direct Push"></topic>
<topic href="help/EGit/User_Guide/Tasks.html#Push_Wizard" label="Push Wizard">
<topic href="help/EGit/User_Guide/Tasks.html#Push_URI" label="Push URI"></topic>
@@ -65,13 +67,17 @@
</topic>
</topic>
<topic href="help/EGit/User_Guide/Tasks.html#Fetching_from_other_Repositories" label="Fetching from other Repositories">
+ <topic href="help/EGit/User_Guide/Tasks.html#Fetching_from_upstream" label="Fetching from upstream">
+ <topic href="help/EGit/User_Guide/Tasks.html#Configuring_upstream_fetch" label="Configuring upstream fetch"></topic>
+ </topic>
<topic href="help/EGit/User_Guide/Tasks.html#Direct_Fetch" label="Direct Fetch"></topic>
<topic href="help/EGit/User_Guide/Tasks.html#Fetch_Wizard" label="Fetch Wizard">
<topic href="help/EGit/User_Guide/Tasks.html#Fetch_Ref_Specifications" label="Fetch Ref Specifications"></topic>
<topic href="help/EGit/User_Guide/Tasks.html#Fetch_Result_Report" label="Fetch Result Report"></topic>
</topic>
</topic>
- <topic href="help/EGit/User_Guide/Tasks.html#Pulling_New_Changes_from_Upstream_Repositories" label="Pulling New Changes from Upstream Repositories"></topic>
+ <topic href="help/EGit/User_Guide/Tasks.html#Pulling_New_Changes_from_Upstream_Branch.3Cbr.3E" label="Pulling New Changes from Upstream Branch&lt;br&quot;"></topic>
+ <topic href="help/EGit/User_Guide/Tasks.html#Fetching_a_change_from_a_Gerrit_Code_Review_Server" label="Fetching a change from a Gerrit Code Review Server"></topic>
</topic>
<topic href="help/EGit/User_Guide/Tasks.html#Inspecting_the_state_of_the_Repository" label="Inspecting the state of the Repository">
<topic href="help/EGit/User_Guide/Tasks.html#Label_Decorations" label="Label Decorations">
@@ -80,15 +86,23 @@
</topic>
<topic href="help/EGit/User_Guide/Tasks.html#Commit_Dialog" label="Commit Dialog"></topic>
<topic href="help/EGit/User_Guide/Tasks.html#Comparing_Content" label="Comparing Content">
+ <topic href="help/EGit/User_Guide/Tasks.html#Compare_editor_and_Git_Tree_Compare_View" label="Compare editor and Git Tree Compare View"></topic>
<topic href="help/EGit/User_Guide/Tasks.html#Compare_working_tree_with_last_commit" label="Compare working tree with last commit"></topic>
<topic href="help/EGit/User_Guide/Tasks.html#Comparing_Working_Tree_with_Index" label="Comparing Working Tree with Index"></topic>
- <topic href="help/EGit/User_Guide/Tasks.html#Comparing_Working_Tree_with_Any_Commit" label="Comparing Working Tree with Any Commit"></topic>
- <topic href="help/EGit/User_Guide/Tasks.html#Comparing_Two_Commits_with_Each_Other" label="Comparing Two Commits with Each Other"></topic>
+ <topic href="help/EGit/User_Guide/Tasks.html#Comparing_Working_Tree_with_a_branch_or_tag" label="Comparing Working Tree with a branch or tag"></topic>
+ <topic href="help/EGit/User_Guide/Tasks.html#Comparing_Working_Tree_with_Any_Commit" label="Comparing Working Tree with Any Commit">
+ <topic href="help/EGit/User_Guide/Tasks.html#From_the_project_explorer:" label="From the project explorer:"></topic>
+ <topic href="help/EGit/User_Guide/Tasks.html#From_the_history_view_.28files_only.29:" label="From the history view (files only):"></topic>
+ </topic>
+ <topic href="help/EGit/User_Guide/Tasks.html#Comparing_Two_Commits" label="Comparing Two Commits"></topic>
<topic href="help/EGit/User_Guide/Tasks.html#Comparing_Index_with_HEAD_or_Any_Other_Commit" label="Comparing Index with HEAD or Any Other Commit"></topic>
</topic>
<topic href="help/EGit/User_Guide/Tasks.html#Comparing_with_Branches_.28Synchronize.29" label="Comparing with Branches (Synchronize)"></topic>
<topic href="help/EGit/User_Guide/Tasks.html#Quickdiff" label="Quickdiff"></topic>
- <topic href="help/EGit/User_Guide/Tasks.html#View_Diff_for_a_Commit" label="View Diff for a Commit"></topic>
+ <topic href="help/EGit/User_Guide/Tasks.html#Inspecting_Commits" label="Inspecting Commits">
+ <topic href="help/EGit/User_Guide/Tasks.html#View_Diff_for_a_Commit" label="View Diff for a Commit"></topic>
+ <topic href="help/EGit/User_Guide/Tasks.html#Showing_the_contents_of_a_Commit" label="Showing the contents of a Commit"></topic>
+ </topic>
</topic>
<topic href="help/EGit/User_Guide/Tasks.html#Committing_Changes" label="Committing Changes">
<topic href="help/EGit/User_Guide/Tasks.html#Modifying_the_content" label="Modifying the content"></topic>
@@ -102,6 +116,7 @@
<topic href="help/EGit/User_Guide/Tasks.html#Replace_with_File_in_Git_Index" label="Replace with File in Git Index"></topic>
<topic href="help/EGit/User_Guide/Tasks.html#Replace_with_HEAD" label="Replace with HEAD"></topic>
</topic>
+ <topic href="help/EGit/User_Guide/Tasks.html#Reverting_changes_introduced_by_a_specific_commit" label="Reverting changes introduced by a specific commit"></topic>
<topic href="help/EGit/User_Guide/Tasks.html#Resetting_your_current_HEAD" label="Resetting your current HEAD">
<topic href="help/EGit/User_Guide/Tasks.html#Reset_to_specific_branch_or_tag" label="Reset to specific branch or tag"></topic>
<topic href="help/EGit/User_Guide/Tasks.html#Reset_to_a_specific_commit" label="Reset to a specific commit"></topic>
@@ -109,13 +124,14 @@
</topic>
</topic>
<topic href="help/EGit/User_Guide/Tasks.html#Branching" label="Branching">
- <topic href="help/EGit/User_Guide/Tasks.html#Branching_in_the_Repositories_View" label="Branching in the Repositories View"></topic>
<topic href="help/EGit/User_Guide/Tasks.html#Branching_Dialog" label="Branching Dialog">
<topic href="help/EGit/User_Guide/Tasks.html#Creating_a_New_Local_Branch" label="Creating a New Local Branch"></topic>
<topic href="help/EGit/User_Guide/Tasks.html#Renaming_an_Existing_Branch" label="Renaming an Existing Branch"></topic>
<topic href="help/EGit/User_Guide/Tasks.html#Checking_out_a_Branch" label="Checking out a Branch"></topic>
</topic>
+ <topic href="help/EGit/User_Guide/Tasks.html#Branching_in_the_Repositories_View" label="Branching in the Repositories View"></topic>
<topic href="help/EGit/User_Guide/Tasks.html#Branching_in_the_History_View" label="Branching in the History View"></topic>
+ <topic href="help/EGit/User_Guide/Tasks.html#Branch_Creation_Dialog" label="Branch Creation Dialog"></topic>
</topic>
<topic href="help/EGit/User_Guide/Tasks.html#Merging" label="Merging">
<topic href="help/EGit/User_Guide/Tasks.html#Merging_a_branch_or_a_tag_into_the_current_branch" label="Merging a branch or a tag into the current branch">
@@ -152,6 +168,7 @@
<topic href="help/EGit/User_Guide/Tasks.html#Tagging" label="Tagging">
<topic href="help/EGit/User_Guide/Tasks.html#Creating_a_Tag" label="Creating a Tag"></topic>
<topic href="help/EGit/User_Guide/Tasks.html#Replacing_an_Existing_Tag" label="Replacing an Existing Tag"></topic>
+ <topic href="help/EGit/User_Guide/Tasks.html#Deletion_of_tags" label="Deletion of tags"></topic>
<topic href="help/EGit/User_Guide/Tasks.html#Light-weight_and_Signed_Tags" label="Light-weight and Signed Tags"></topic>
</topic>
<topic href="help/EGit/User_Guide/Tasks.html#Patches" label="Patches">
@@ -178,12 +195,14 @@
<topic href="help/EGit/User_Guide/Tasks.html#Branch_and_Tag_Support" label="Branch and Tag Support">
<topic href="help/EGit/User_Guide/Tasks.html#Check-out_of_Branches_and_Tags" label="Check-out of Branches and Tags"></topic>
<topic href="help/EGit/User_Guide/Tasks.html#Creation_and_Deletion_of_Branches" label="Creation and Deletion of Branches"></topic>
+ <topic href="help/EGit/User_Guide/Tasks.html#Rebasing_2" label="Rebasing"></topic>
<topic href="help/EGit/User_Guide/Tasks.html#Merging_a_Branch_or_a_Tag" label="Merging a Branch or a Tag"></topic>
<topic href="help/EGit/User_Guide/Tasks.html#Synchronizing_with_a_Branch_or_a_Tag" label="Synchronizing with a Branch or a Tag"></topic>
<topic href="help/EGit/User_Guide/Tasks.html#Determining_the_Checked-out_Branch" label="Determining the Checked-out Branch"></topic>
<topic href="help/EGit/User_Guide/Tasks.html#Resetting_to_a_Branch_or_a_Tag" label="Resetting to a Branch or a Tag"></topic>
<topic href="help/EGit/User_Guide/Tasks.html#.22Detached.22_HEAD" label="&quot;Detached&quot; HEAD"></topic>
</topic>
+ <topic href="help/EGit/User_Guide/Tasks.html#Inspecting_References" label="Inspecting References"></topic>
<topic href="help/EGit/User_Guide/Tasks.html#Browsing_the_Working_Directory" label="Browsing the Working Directory"></topic>
<topic href="help/EGit/User_Guide/Tasks.html#Repository_Configuration" label="Repository Configuration"></topic>
<topic href="help/EGit/User_Guide/Tasks.html#Remote_Repositories" label="Remote Repositories">
@@ -199,6 +218,10 @@
<topic href="help/EGit/User_Guide/Tasks.html#Bare_Repositories" label="Bare Repositories"></topic>
<topic href="help/EGit/User_Guide/Tasks.html#Removing_Repositories_from_the_Git_Repositories_View" label="Removing Repositories from the Git Repositories View"></topic>
</topic>
+ <topic href="help/EGit/User_Guide/Tasks.html#Working_with_Tasks" label="Working with Tasks">
+ <topic href="help/EGit/User_Guide/Tasks.html#Installation" label="Installation"></topic>
+ <topic href="help/EGit/User_Guide/Tasks.html#Commit_Message_Template" label="Commit Message Template"></topic>
+ </topic>
</topic>
<topic href="help/EGit/User_Guide/Reference.html" label="Reference">
<topic href="help/EGit/User_Guide/Reference.html#Menus" label="Menus">
@@ -206,6 +229,7 @@
<topic href="help/EGit/User_Guide/Reference.html#Resource_Context_Menu" label="Resource Context Menu"></topic>
<topic href="help/EGit/User_Guide/Reference.html#Repositories_View_Menus" label="Repositories View Menus"></topic>
<topic href="help/EGit/User_Guide/Reference.html#History_View_Menus" label="History View Menus"></topic>
+ <topic href="help/EGit/User_Guide/Reference.html#Git_Workbench_Toolbar_and_Git_Workbench_Menu" label="Git Workbench Toolbar and Git Workbench Menu"></topic>
<topic href="help/EGit/User_Guide/Reference.html#Menu_Actions" label="Menu Actions"></topic>
</topic>
<topic href="help/EGit/User_Guide/Reference.html#Git_Perspective_and_Views" label="Git Perspective and Views">
@@ -237,10 +261,14 @@
<topic href="help/EGit/User_Guide/Reference.html#Create_Branch..." label="Create Branch..."></topic>
<topic href="help/EGit/User_Guide/Reference.html#Create_Tag..." label="Create Tag..."></topic>
<topic href="help/EGit/User_Guide/Reference.html#Create_Patch..." label="Create Patch..."></topic>
+ <topic href="help/EGit/User_Guide/Reference.html#Cherry_Pick" label="Cherry Pick"></topic>
+ <topic href="help/EGit/User_Guide/Reference.html#Revert_Commit" label="Revert Commit"></topic>
+ <topic href="help/EGit/User_Guide/Reference.html#Merge" label="Merge"></topic>
+ <topic href="help/EGit/User_Guide/Reference.html#Rebase_on_top_of" label="Rebase on top of"></topic>
<topic href="help/EGit/User_Guide/Reference.html#Reset_.3E_Soft.2FMixed.2FHard" label="Reset &quot; Soft/Mixed/Hard"></topic>
<topic href="help/EGit/User_Guide/Reference.html#Quickdiff_.3E_Reset_Quickdiff_Basline_to_HEAD" label="Quickdiff &quot; Reset Quickdiff Basline to HEAD"></topic>
<topic href="help/EGit/User_Guide/Reference.html#Quickdiff_.3E_Reset_Quickdiff_Basline_to_first_parent_of_HEAD" label="Quickdiff &quot; Reset Quickdiff Basline to first parent of HEAD"></topic>
- <topic href="help/EGit/User_Guide/Reference.html#Quickdiff_.3E_Set_as_Baseline_.3D" label="Quickdiff &quot; Set as Baseline ="></topic>
+ <topic href="help/EGit/User_Guide/Reference.html#Quickdiff_.3E_Set_as_Baseline" label="Quickdiff &quot; Set as Baseline"></topic>
<topic href="help/EGit/User_Guide/Reference.html#Copy" label="Copy"></topic>
<topic href="help/EGit/User_Guide/Reference.html#Show_Revision_Comment" label="Show Revision Comment"></topic>
<topic href="help/EGit/User_Guide/Reference.html#Show_Revision_Details" label="Show Revision Details"></topic>
@@ -254,10 +282,14 @@
<topic href="help/EGit/User_Guide/Reference.html#Models" label="Models"></topic>
<topic href="help/EGit/User_Guide/Reference.html#Navigation" label="Navigation"></topic>
</topic>
+ <topic href="help/EGit/User_Guide/Reference.html#Git_Tree_Compare_View" label="Git Tree Compare View"></topic>
</topic>
<topic href="help/EGit/User_Guide/Reference.html#Git_URLs" label="Git URLs"></topic>
<topic href="help/EGit/User_Guide/Reference.html#Git_References" label="Git References"></topic>
- <topic href="help/EGit/User_Guide/Reference.html#Refspecs" label="Refspecs"></topic>
+ <topic href="help/EGit/User_Guide/Reference.html#Refspecs" label="Refspecs">
+ <topic href="help/EGit/User_Guide/Reference.html#Push_Refspecs" label="Push Refspecs"></topic>
+ <topic href="help/EGit/User_Guide/Reference.html#Fetch_Refspecs" label="Fetch Refspecs"></topic>
+ </topic>
<topic href="help/EGit/User_Guide/Reference.html#Remotes" label="Remotes"></topic>
<topic href="help/EGit/User_Guide/Reference.html#Git_Ignore" label="Git Ignore"></topic>
<topic href="help/EGit/User_Guide/Reference.html#Git_Fetch_Factory_for_PDE_Build" label="Git Fetch Factory for PDE Build"></topic>
@@ -305,33 +337,31 @@
</topic>
<topic href="help/JGit/User_Guide/Updating-This-Document.html" label="Updating This Document"></topic>
</topic>
- <topic href="help/EGit/New_and_Noteworthy/0.10/0.10.html" label="EGit 0.10 New and Noteworthy">
- <topic href="help/EGit/New_and_Noteworthy/0.10/0.10.html" label="Pull Support"></topic>
- <topic href="help/EGit/New_and_Noteworthy/0.10/Rebase-Support.html" label="Rebase Support"></topic>
- <topic href="help/EGit/New_and_Noteworthy/0.10/Cherry-pick-Support.html" label="Cherry-pick Support"></topic>
- <topic href="help/EGit/New_and_Noteworthy/0.10/Merge-Tool.html" label="Merge Tool"></topic>
- <topic href="help/EGit/New_and_Noteworthy/0.10/Synchronize-View-Local-Changes-in-Changeset-Mode.html" label="Synchronize View - Local Changes in Changeset Mode"></topic>
- <topic href="help/EGit/New_and_Noteworthy/0.10/HTTP-Authentication.html" label="HTTP Authentication"></topic>
- <topic href="help/EGit/New_and_Noteworthy/0.10/Repositories-View-Improvements.html" label="Repositories View Improvements">
- <topic href="help/EGit/New_and_Noteworthy/0.10/Repositories-View-Improvements.html#Drag_and_Drop_Support" label="Drag and Drop Support"></topic>
- <topic href="help/EGit/New_and_Noteworthy/0.10/Repositories-View-Improvements.html#Support_for_References" label="Support for References"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/0.11/0.11.html" label="EGit 0.11 New and Noteworthy">
+ <topic href="help/EGit/New_and_Noteworthy/0.11/0.11.html" label="Feature">
+ <topic href="help/EGit/New_and_Noteworthy/0.11/0.11.html#Fetch_Change_from_Gerrit" label="Fetch Change from Gerrit"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/0.11/0.11.html#Actions_for_Push_and_Fetch_using_upstream_configuration" label="Actions for Push and Fetch using upstream configuration"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/0.11/0.11.html#Simplified_Wizards_for_Configuration_of_Fetch_and_Push" label="Simplified Wizards for Configuration of Fetch and Push"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/0.11/0.11.html#History_View" label="History View"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/0.11/0.11.html#Compare" label="Compare"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/0.11/0.11.html#EGit_Mylyn_Integration:_Commit_Dialog" label="EGit Mylyn Integration: Commit Dialog"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/0.11/0.11.html#EGit_Mylyn_Integration:_History_View" label="EGit Mylyn Integration: History View"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/0.11/0.11.html#Performance_Improvements" label="Performance Improvements"></topic>
</topic>
- <topic href="help/EGit/New_and_Noteworthy/0.10/History-View-Enhancements.html" label="History View Enhancements"></topic>
- <topic href="help/EGit/New_and_Noteworthy/0.10/Auto-wrapping-Commit-Messages.html" label="Auto-wrapping Commit Messages"></topic>
- <topic href="help/EGit/New_and_Noteworthy/0.10/PDE-Build-Fetch-Factory.html" label="PDE Build Fetch Factory"></topic>
- <topic href="help/EGit/New_and_Noteworthy/0.10/Bugs-Closed.html" label="Bugs Closed"></topic>
- <topic href="help/EGit/New_and_Noteworthy/0.10/Commits.html" label="Commits"></topic>
- <topic href="help/EGit/New_and_Noteworthy/0.10/Updating-This-Document.html" label="Updating This Document"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/0.11/Bugs-Closed.html" label="Bugs Closed"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/0.11/Commits.html" label="Commits"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/0.11/Updating-This-Document.html" label="Updating This Document"></topic>
</topic>
- <topic href="help/JGit/New_and_Noteworthy/0.10/0.10.html" label="JGit 0.10 New and Noteworthy">
- <topic href="help/JGit/New_and_Noteworthy/0.10/0.10.html" label="Histogram Diff"></topic>
- <topic href="help/JGit/New_and_Noteworthy/0.10/HTTP-basic-and-digest-authentication.html" label="HTTP basic and digest authentication"></topic>
- <topic href="help/JGit/New_and_Noteworthy/0.10/Performance-New-IndexDiffFilter.html" label="Performance: New IndexDiffFilter"></topic>
- <topic href="help/JGit/New_and_Noteworthy/0.10/Git-Porcelain-API-Updates.html" label="Git Porcelain API Updates"></topic>
- <topic href="help/JGit/New_and_Noteworthy/0.10/User-Guide.html" label="User Guide"></topic>
- <topic href="help/JGit/New_and_Noteworthy/0.10/Bugs-Closed.html" label="Bugs Closed"></topic>
- <topic href="help/JGit/New_and_Noteworthy/0.10/Commits.html" label="Commits"></topic>
- <topic href="help/JGit/New_and_Noteworthy/0.10/Updating-This-Document.html" label="Updating This Document"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/0.11/0.11.html" label="JGit 0.11 New and Noteworthy">
+ <topic href="help/JGit/New_and_Noteworthy/0.11/0.11.html" label="Git Porcelain API Updates"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/0.11/Features.html" label="Features">
+ <topic href="help/JGit/New_and_Noteworthy/0.11/Features.html#Support_for_self_signed_certificate_.28HTTPS.29" label="Support for self signed certificate (HTTPS)"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/0.11/Features.html#Note_Support" label="Note Support"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/0.11/Features.html#Configuration" label="Configuration"></topic>
+ </topic>
+ <topic href="help/JGit/New_and_Noteworthy/0.11/Bugs-Closed.html" label="Bugs Closed"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/0.11/Commits.html" label="Commits"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/0.11/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>

Back to the top