diff options
| author | Matthias Sohn | 2010-06-02 00:56:48 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2010-06-02 14:19:26 +0000 |
| commit | 22f062a97525fb226df53a89f084455590ecbc68 (patch) | |
| tree | 347c9f03d0919850870445f805574bee36615b74 | |
| parent | 4e05b4a52ca736a207918d47eb3574d86089785d (diff) | |
| download | egit-22f062a97525fb226df53a89f084455590ecbc68.tar.gz egit-22f062a97525fb226df53a89f084455590ecbc68.tar.xz egit-22f062a97525fb226df53a89f084455590ecbc68.zip | |
Update egit help for 0.8.0 from wiki
Change-Id: I1bee00fc75f619e35dc64ccead61a507f58855a8
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
30 files changed, 1084 insertions, 278 deletions
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/Branching.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Branching.html new file mode 100644 index 0000000000..6f3f14a501 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/Branching.html @@ -0,0 +1,110 @@ +<?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 User Guide - Branching</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">Branching</th> + </tr> + <tr> + <td style="width: 20%" align="left"> + <a href="Reverting-Changes.html" title="Reverting Changes"> + <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="Merging.html" title="Merging"> + <img alt="Next" border="0" src="../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top">Reverting Changes</td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Merging</td> + </tr> + </table><hr/> + <h1 id="Branching">Branching</h1> + <h2 id="Branching_in_the_Repositories_View">Branching in the Repositories View</h2> + <p>The Repositories View + <a href="Managing-Repositories.html#Branch_and_Tag_Support">supports</a> the following branching actions: + </p> + <ul> + <li> + <a href="Managing-Repositories.html#Check-out_of_Branches_and_Tags">Checkout of branches</a> + </li> + <li> + <a href="Managing-Repositories.html#Creation_and_Deletion_of_Branches">Creation and deletion of branches</a> + </li> + <li> + <a href="Managing-Repositories.html#Determining_the_Checked-out_Branch">Determining the checked out branch</a> + </li> + </ul> + <h2 id="Branching_Dialog">Branching Dialog</h2> + <p>To open the branching dialog click + + <br/> + + <b>Team > Branch...</b> + </p> + <p> + <img border="0" src="images/Egit-0.8-branch-dialog.png"/> + </p> + <h3 id="Creating_a_New_Local_Branch">Creating a New Local Branch</h3> + <ul> + <li>Select the branch your new branch should be based on</li> + <li>Click + <b>New Branch</b> + </li> + <li>Enter the branch name and click + <b>OK</b> + </li> + </ul> + <h3 id="Renaming_an_Existing_Branch">Renaming an Existing Branch</h3> + <ul> + <li>Select the branch you want to rename</li> + <li>Click + <b>Rename</b> + </li> + <li>Enter the new branch name and click + <b>OK</b> + </li> + </ul> + <h3 id="Checking_out_a_Branch">Checking out a Branch</h3> + <ul> + <li>Select the branch you want to check out</li> + <li>Click + <b>Checkout</b> + </li> + </ul><hr/> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <td style="width: 20%" align="left"> + <a href="Reverting-Changes.html" title="Reverting Changes"> + <img alt="Previous" border="0" src="../../images/prev.gif"/> + </a> + </td> + <td style="width: 60%" align="center"> + <a href="User-Guide.html" title="EGit User Guide"> + <img alt="EGit User Guide" border="0" src="../../images/home.gif"/> + </a> + </td> + <td style="width: 20%" align="right"> + <a href="Merging.html" title="Merging"> + <img alt="Next" border="0" src="../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top">Reverting Changes</td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Merging</td> + </tr> + </table> + </body> +</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/Committing-Changes.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Committing-Changes.html index 77d141d65a..2c3074cf04 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Committing-Changes.html +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/Committing-Changes.html @@ -32,7 +32,10 @@ <h1 id="Committing_Changes">Committing Changes</h1> <p>Modifications to a project which is version-controlled with Git are persistently recorded in the history through commits. In Git you modify your project until you have reached a state you are satisfied with and then you commit all these changes together to the repository in one single commit. </p> <h2 id="Modifying_the_content">Modifying the content</h2> - <p>If you have a project which is already shared with Git then doing the actual modifications is easy: just modify or delete files either within Eclipse or even directly on the file-system. There is no need to "check-out" files or to tell Git in advance about these operations. Only when adding new files you should be cautious: new files which should be version-controlled have to be explicitly put under Git version control using the file's "Track" context-menu entry or immediately before a commit in the Commit dialog you may display untracked files by checking the "Show untracked Files" checkbox and select them for inclusion in the commit. </p> + <p>If you have a project which is already shared with Git then doing the actual modifications is easy: just modify or delete files either within Eclipse or even directly on the file-system. There is no need to "check-out" files or to tell Git in advance about these operations. Only when adding new files you should be cautious: new files which should be version-controlled have to be explicitly put under Git version control using the file's + <b>Track</b> menu action or immediately before a commit in the Commit dialog you may display untracked files by checking the + <b>Show untracked Files</b> checkbox and select them for inclusion in the commit. + </p> <p> <img border="0" src="images/EGit-AddFile.png"/> </p> @@ -44,7 +47,9 @@ <img border="0" src="images/EGit-AddedAndModifiedFiles.png"/> </p> <h2 id="Committing">Committing</h2> - <p>When you are satisfied with the state of the project you may commit your changes. To do that select "Team -> Commit..." from the context menu of a project or a file in the project. </p> + <p>When you are satisfied with the state of the project you may commit your changes. To do that select + <b>Team > Commit...</b> from the context menu of a project or a file in the project. + </p> <p> <img border="0" src="images/EGit-Commit.png"/> </p> @@ -53,9 +58,8 @@ <p> <img border="0" src="images/EGit-CommitDialog2.png"/> </p> + <h3 id="Commit_Message">Commit Message</h3> <p> - <b>Commit Message</b> - <br/>In this dialog you specifiy the commit message describing the change. </p> <p>It is good practice to start the message with a short first line summarizing the change followed by a blank line and then the message body. In order to ensure that also git command line tools can format these messages nicely the lines shouldn't be formatted too wide. @@ -76,7 +80,9 @@ Signed-off-by: William Shakespeare <will.from@the.past> <p> <b>One example:</b> Imagine since the last commit you have fixed a bug in A.java and you have added a new method to B.java. These two modifications are logically independent from each other hence you may want to commit them in two independant commits. In this case you initate the commit, deselect B.java from the set of committed files and specify a commit message describing only the bugfix in A.java. After a succesfull first commit you just call commit again and the upcoming dialog will present you the remaining changes in B.java. Now you specify a commit message describing the addition of the method and finish the second commit. </p> - <p>New files you added to the project which have not been explicitly added to version control (see "Modifying the content") will be listed in the commit dialog if you select the checkbox "Show untracked Files". If you select the checkbox in front of these files in the list they will be added to the repository and committed once you press the commit button. Files which are excluded by the team ignore list or which are derived (e.g. the bin folder in java projects) will not be shown here. If you have no other changes in your repository than such untracked files the checkbox "Show untracked Files" is selected by default.</p> + <p>New files you added to the project which have not been explicitly added to version control (see "Modifying the content") will be listed in the commit dialog if you select the checkbox "Show untracked Files". If you select the checkbox in front of these files in the list they will be added to the repository and committed once you press the commit button. Files which are excluded by the team ignore list or which are derived (e.g. the bin folder in java projects) will not be shown here. If you have no other changes in your repository than such untracked files the checkbox + <b>Show untracked Files</b> is selected by default. + </p> <h3 id="Amending_Commits">Amending Commits</h3> <p>When you commit you may specify that the current commit should "amend" the previous commit in the current branch. Your commit will then replace the previous commit. This feature is often use to correct wrong commits before they are published to other repositories. </p> <p>Example: Imagine you have committed a change to a file containing a typo </p> @@ -87,7 +93,9 @@ Signed-off-by: William Shakespeare <will.from@the.past> <p> <img border="0" src="images/EGit-Corrected.png"/> </p> - <p>Afterwards you trigger the commit and select the option "Amend previous commit". </p> + <p>Afterwards you trigger the commit and select the option + <b>Amend previous commit</b>. + </p> <p> <img border="0" src="images/EGit-AmendBringsOldCommitMessage.png"/> </p> @@ -95,7 +103,7 @@ Signed-off-by: William Shakespeare <will.from@the.past> <p>As an alternative to amending you could just commit the corrected version as a subsequent commit. But the first commit containing the typo is of no use to anybody else and in order not to clutter the history of your project with unneeded commits you may decide to use the amend feature. </p> <p>Be aware that amending commits which are already published to other repositories may cause trouble. Once you have pushed a commit to a remote repository or your local repository was cloned by somebody else you should be very careful whith amending commits. In this case publishing a second commit which corrects the first one is probably a better solution. </p> <h3 id="Signing_off_commits">Signing off commits</h3> - <p>Git gives you the chance to "sign off" commits. This adds a "Signed-off-by: <Your Name and Email-Adress>" footer to the commit message. The purpose of this signed-off-by information is not defined by Git but by the team using Git. Some teams use this information to record who has reviewed a certain commit. Other teams use the signed-off information to record that a commiter agreed to certain standards/rules. E.g. you may have to sign-off your own commits to state that you have read and understood the license-specific rules of your project.</p><hr/> + <p>Git gives you the chance to "sign off" commits. This adds a <tt>Signed-off-by: <Your Name and Email-Adress></tt> footer to the commit message. The purpose of this signed-off-by information is not defined by Git but by the team using Git. Some teams use this information to record who has reviewed a certain commit. Other teams use the signed-off information to record that a commiter agreed to certain standards/rules. E.g. you may have to sign-off your own commits to state that you have read and understood the license-specific rules of your project.</p><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/EGit/User_Guide/Creating-Repositories.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Creating-Repositories.html index 2b7dc9093a..80fb43976a 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Creating-Repositories.html +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/Creating-Repositories.html @@ -38,11 +38,18 @@ <p>You may first create all projects under a common directory and then create a common repository for all projects in one go: </p> <ul> <li>create the Eclipse projects e.g. a, b, c under a common directory e.g. <span style="font-family:monospace;">/repos/examples/</span> </li> - <li>select all projects a, b, c - from context menu click "Team" > "Share Project" > "Git" </li> - <li>press "Next" </li> + <li>select all projects a, b, c - from context menu click + <b>Team > Share Project > Git</b> + </li> + <li>press + <b>Next</b> + </li> <li>select all projects a, b, c </li> <li>the wizard automatically moves up the default repository location to the parent folder <span style="font-family:monospace;">/repos/examples/</span> since multiple projects have been selected </li> - <li>click "Create Repository" and click "Finish"</li> + <li>click + <b>Create Repository</b> and click + <b>Finish</b> + </li> </ul><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/Inspecting-the-state-of-the-Repository.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Inspecting-the-state-of-the-Repository.html index abb3fe22bf..a319aff316 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Inspecting-the-state-of-the-Repository.html +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/Inspecting-the-state-of-the-Repository.html @@ -32,28 +32,39 @@ <h1 id="Inspecting_the_state_of_the_Repository">Inspecting the state of the Repository</h1> <h2 id="Label_Decorations">Label Decorations</h2> <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> - <p>The Git label decorations can be switched on globally in the Preference Menu (Window -> Preferences) under General -> Appearance -> Label Decorations. </p> - <p>More detailed settings can be done in the Preferences under Team -> Git -> Label Decorations. </p> + <p>The Git label decorations can be switched on globally in the Preference Menu ( + <b>Window > Preferences</b>) under + <b>General > Appearance > Label Decorations</b>. + </p> + <p>More detailed settings can be done in the Preferences under + <b>Team > Git > Label Decorations</b>. + </p> <p>There are two different types of label decorations: text decorations and icon decorations. </p> - <p> - <b>Text Decorations</b> - <br/> Text decorations appear on the left or right side of the text label. They can be configured on the Preferences dialog under Team -> Git -> Label Decorations on the tab "Text Decorations". For example, the default for a dirty resource is a > on the left side of its name. + <h3 id="Text_Decorations">Text Decorations</h3> + <p>Text decorations appear on the left or right side of the text label. They can be configured on the Preferences dialog under + <b>Team > Git > Label Decorations</b> on the tab + <b>Text Decorations</b>. For example, the default for a dirty resource is a <tt> + <b>></b></tt> on the left side of its name. </p> <p>These are the default settings: </p> <p> <img border="0" src="images/01-TextDecorations.png"/> </p> - <p>For files and folders there are the variables "name", "dirty" and "staged". "Dirty" and "staged" are flags; if they are true, the text after the colon is displayed.</p> - <p>For projects there are the additional variables "repository" and "branch". The "repository" variable displays the name of the repository.</p> - <p>The "branch" variable displays the name of the currently checked out branch. If no branch is checked out, the decoration shows the shortened name of the commit (first seven characters followed by ellipsis). If tags and/or remote branches are pointing to this commit, a "best guess" heuristic is applied to also show this information: tags take precedence over remote branches, if several tags apply, the newest one is displayed; if there are several remote branches or tags have no modification date, then alphabetic sorting is applied and the last one is shown. Example: the checked out commit "e49f576..." refers to tag "v.0.7.1" of repository "egit": + <p>For files and folders there are the variables <tt>"name"</tt>, <tt>"dirty"</tt> and <tt>"staged"</tt>. <tt>"Dirty"</tt> and <tt>"staged"</tt> are flags; if they are true, the text after the colon is displayed.</p> + <p>For projects there are the additional variables <tt>"repository"</tt> and <tt>"branch"</tt>. The <tt>"repository"</tt> variable displays the name of the repository.</p> + <p>The <tt>"branch"</tt> variable displays the name of the currently checked out branch. If no branch is checked out, the decoration shows the shortened name of the commit (first seven characters followed by ellipsis). If tags and/or remote branches are pointing to this commit, a "best guess" heuristic is applied to also show this information: tags take precedence over remote branches, if several tags apply, the newest one is displayed; if there are several remote branches or tags have no modification date, then alphabetic sorting is applied and the last one is shown. Example: the checked out commit <tt> + <b>e49f576...</b></tt> refers to tag <tt> + <b>v.0.7.1</b></tt> of repository <tt> + <b>egit</b></tt>: <br/> </p> <p> <img border="0" src="images/03-ExampleDecoration.png"/> </p> - <p> - <b>Icon Decorations</b> - <br/> Icon decorations appear on the lower right corner of the icon displayed in front of the label. They can be configured on the Preferences dialog under Team -> Git -> Label Decorations on the tab "Icon Decorations". + <h3 id="Icon_Decorations">Icon Decorations</h3> + <p>Icon decorations appear on the lower right corner of the icon displayed in front of the label. They can be configured on the Preferences dialog under + <b>Team > Git > Label Decorations</b> on the tab + <b>Icon Decorations</b>. </p> <p>These are the default decorations: </p> <p> @@ -70,7 +81,8 @@ <b>untracked</b> - The resource is not known to the Git repository and will not be version controlled until it is explicitly added. </li> <li> - <b>ignored</b> - The resource is ignored by the Git team provider. Here only the preference settings under Team -> Ignored Resources and the "derived" flag are relevant. Settings from .gitignore files are not yet taken into account. + <b>ignored</b> - The resource is ignored by the Git team provider. Here only the preference settings under + <b>Team > Ignored Resources</b> and the "derived" flag are relevant. Settings from <tt>.gitignore</tt> files are not yet taken into account. </li> <li> <b>dirty</b> - The resource has changes in the working tree that are neither in the index nor in the repository. @@ -91,19 +103,21 @@ <b>conflict</b> - A merge conflict exists for the file. </li> <li> - <b>assume-valid</b> - The resource has the "assume unchanged" flag. 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 Team->Assume unchanged (or on the command line with git update-index --assume-unchanged). Currently it can only be switched back on the command line with git update-index --no-assume-unchanged. + <b>assume-valid</b> - The resource has the "assume unchanged" flag. 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. Also see + <a href="Perspective-Views-and-Menus.html#Menu_Actions">Assume unchanged action</a>. </li> </ul> - <h2 id="History_View">History View</h2> + <h2 id="History_View_2">History View</h2> <p>The History View displays the the history of the files versioned in a Git repository. - Open the History View by selecting "Show In -> History View" from the context menu on any resource under Git version control.</p> + To open the History View select + <b>Show In > History View</b> from the context menu on any resource under Git version control. + </p> <p> <img border="0" src="images/Egit-0.8-history-view.png"/> </p> <p>The top level pane is the commit graph displaying the commit log in reverse chronological order (newest commit on top).</p> <p> <img border="0" src="images/Egit-0.8-history-view-branches.png"/> - <br/> </p> <ul> <li>The tips of local branches are shown as green rectangles</li> @@ -112,7 +126,6 @@ </ul> <p> <img border="0" src="images/Egit-0.8-history-view-tag.png"/> - <br/> </p> <ul> <li>Tags are shown as yellow rectangles</li> @@ -180,44 +193,45 @@ <img border="0" src="images/03-CompareWith.png"/> </p> <p>Currently a compare dialog can only be opened for a single selected file. </p> - <p> - <b>Compare working tree with last commit</b> - <br/> 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" -> "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> - <b>Compare working tree with index</b> - <br/> The difference between a file in the current working directory and in the index can be viewed from the context menu "Compare With" -> "Git Index". - </p> - <p> - <b>Compare working tree with any commit</b> - <br/> + <h3 id="Compare_working_tree_with_last_commit">Compare working tree with last commit</h3> + <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" -> "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> + <h3 id="Comparing_Working_Tree_with_Index">Comparing Working Tree with Index</h3> + <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 > Git Index</b>. </p> + <h3 id="Comparing_Working_Tree_with_Any_Commit">Comparing Working Tree with Any Commit</h3> <ul> <li>Select a file in the package explorer </li> - <li>from the context menu select "Show in" > "History" or "Compare With" -> "History..."</li> + <li>from the context menu select + <b>Show in > History</b> or + <b>Compare With > History...</b> + </li> <li>in the commit graph select a commit </li> - <li>from the context menu select "Compare with working tree" </li> + <li>from the context menu select + <b>Compare with working tree</b> + </li> <li>this will open a compare dialog showing the changes between the selected commit and the current working tree</li> </ul> - <p> - <b>Compare two commits with each other</b> - <br/> - </p> + <h3 id="Comparing_Two_Commits_with_Each_Other">Comparing Two Commits with Each Other</h3> <ul> <li>Select a file in the package explorer </li> - <li>from the context menu select "Show in" > "History" or "Compare With" -> "History..."</li> + <li>from the context menu select + <b>Show in > History</b> or + <b>Compare With > History...</b> + </li> <li>in the commit graph select two commits </li> - <li>from the context menu select "Compare with each other" </li> + <li>from the context menu select + <b>Compare with each other</b> + </li> <li>this will open a compare dialog showing the changes between the two selected commits</li> </ul> - <p> - <b>Compare index with HEAD or any other commit</b> - <br/> This feature is not implemented yet. - </p> + <h3 id="Comparing_Index_with_HEAD_or_Any_Other_Commit">Comparing Index with HEAD or Any Other Commit</h3> + <p>This feature is not implemented yet.</p> <h2 id="Quickdiff">Quickdiff</h2> <p>Instead of using a compare editor you can enable quick diff support and see the changes within the text editor. - <br/>This feature can be enabled via the General > Editors > Text Editors > Quick Diff preference page: + <br/>This feature can be enabled via the + <b>General > Editors > Text Editors > Quick Diff</b> preference page: </p> <p> <img border="0" src="images/04-QuickDiffPreferences.png"/> @@ -230,7 +244,9 @@ <p> <img border="0" src="images/06-QuickDiffInEditorPopup.png"/> </p> - <p>Per default, the comparison is against the HEAD. You can determine the version you are comparing to, the so-called quickdiff baseline, from the context menu of a commit in the history view (Show in -> History). There are three menu entries: </p> + <p>Per default, the comparison is against the HEAD. You can determine the version you are comparing to, the so-called quickdiff baseline, from the context menu of a commit in the history view ( + <b>Show in > History</b>). There are three menu entries: + </p> <ul> <li> <b>Quick Diff -> Reset baseline to first parent of HEAD</b> - Compare against the first commit before HEAD. @@ -245,7 +261,9 @@ <h2 id="View_Diff_for_a_Commit">View Diff for a Commit</h2> <p>To display the diff for a given commit </p> <ul> - <li>from context menu in package explorer select "Team" > "Show in Resource History" </li> + <li>from context menu in package explorer select + <b>Team > Show in Resource 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> diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/Managing-Repositories.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Managing-Repositories.html index 2782c70ffd..847db69cba 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Managing-Repositories.html +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/Managing-Repositories.html @@ -31,15 +31,24 @@ </table><hr/> <h1 id="Managing_Repositories">Managing Repositories</h1> <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</p> - <pre> Windows -> Show View -> Other... -> Git -> Git Repositories -</pre> - <p>It is also part of the "Git Repository Exploring" perspective available using menu path</p> - <pre> Window -> Open Perspective -> Other... -> Git Repository Exploring -</pre> - <p>If you already have projects in your workspace which are shared with a Git Repository, you can use</p> - <pre> <Context menu> -> Show In... -> Git Repositories -</pre> + <p>This view can be opened using the menu path + + <br/> + + <b>Windows > Show View > Other... > Git > Git Repositories</b> + </p> + <p>It is also part of the "Git Repository Exploring" perspective available using menu path + + <br/> + + <b>Window > Open Perspective > Other... > 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... > Git Repositories</b> + </p> <p>on any resource to open the view:</p> <p> <img border="0" src="images/RepoMgrShowIn.png"/> @@ -52,18 +61,29 @@ <li>Adding a Repository by pasting a Git Repository path to the view</li> </ol> <h3 id="Cloning_a_Repository_2">Cloning a Repository</h3> - <p>In order to clone a Repository, refer to the chapter "Cloning remote Repositories". After a successful clone operation, the newly cloned Repository should appear in the Git Repositories View automatically.</p> - <p>You can also use the "Clone a Git Repository" button from the view's toolbar to start the Clone wizard:</p> + <p>In order to clone a Repository, refer to + <a href="Starting-from-existing-Git-Repositories.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: + </p> <p> <img border="0" src="images/RepoMgrCloneRepositoryIcon.png"/> </p> - <p>Please refer to the description in "Cloning remote Repositories" about how to use the wizard.</p> + <p>Please refer to + <a href="Starting-from-existing-Git-Repositories.html#Cloning_a_Repository">Cloning remote Repositories</a> about how to use the wizard. + </p> <h3 id="Adding_a_Repository_manually">Adding a Repository manually</h3> - <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 "Add an existing Git Repository" button from the view's toolbar:</p> + <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: + </p> <p> <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 "Search" 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 "Ok":</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>: + </p> <p> <img border="0" src="images/RepoMgrSearchDialog.png"/> </p> @@ -72,7 +92,9 @@ <p> <img border="0" src="images/RepoMgrPasteRepositoryPath.png"/> </p> - <p>or simply perform Edit->Paste 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>or simply perform + <b>Edit > 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> <img border="0" src="images/RepoMgrViewWithRepos.png"/> @@ -92,11 +114,14 @@ <p> <img border="0" src="images/RepoMgrImportNodes.png"/> </p> - <p>The rationale for offering the "Import Projects..." 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 "Import Existing Projects" 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 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. + </p> <p>The details of project import are discussed elsewhere.</p> <h3 id="Branch_and_Tag_Support">Branch and Tag Support</h3> <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. - 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 "refs/heads/master" you would find an entry "master" under the "Local Branches" node, instead of "refs/remotes/origin/master" the shortened name "origin/master" is displayed under the "Remote Branches" node. Similarly, tag names are shortened by omitting the "refs/tags/" prefix:</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"/> </p> @@ -121,14 +146,21 @@ <p> <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 "Copy to Clipboard" action is also available using Edit->Copy (or the corresponding keyboard shortcut).</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 + <b>Edit > Copy</b> (or the corresponding keyboard shortcut). + </p> <h3 id="Repository_Configuration">Repository Configuration</h3> - <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 "Open Properties view" action is provided in the context menu:</p> + <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: + </p> <p> <img border="0" src="images/RepoMgrPropertiesView.png"/> </p> <h3 id="Remote_Repositories">Remote Repositories</h3> - <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 "Properties" 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>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: + </p> <p> <img border="0" src="images/RepoMgrRemoteConfig.png"/> </p> @@ -151,12 +183,16 @@ <h4 id="Changing_Remote_Configurations">Changing Remote Configurations</h4> <p>It is also possible to add, remove, or change Fetch/Push Specifications for an existing Remote configuration using the context menu.</p> <h2 id="Refresh">Refresh</h2> - <p>The view is auto-refreshed periodically. The "Refresh" button in the toolbar allows to trigger an immediate refresh:</p> + <p>The view is auto-refreshed periodically. The + <b>Refresh</b> button in the toolbar allows to trigger an immediate refresh: + </p> <p> <img border="0" src="images/RepoMgrRefresh.png"/> </p> <h2 id="Link_with_Selection">Link with Selection</h2> - <p>If the "Link with selection" toggle is enabled, the file or folder corresponding to the current workbench selection will be displayed automatically:</p> + <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: + </p> <p> <img border="0" src="images/RepoMgrLinkWithSelection.png"/> </p> diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/Merging.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Merging.html new file mode 100644 index 0000000000..1531003880 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/Merging.html @@ -0,0 +1,76 @@ +<?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 User Guide - Merging</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">Merging</th> + </tr> + <tr> + <td style="width: 20%" align="left"> + <a href="Branching.html" title="Branching"> + <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="Tagging.html" title="Tagging"> + <img alt="Next" border="0" src="../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top">Branching</td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Tagging</td> + </tr> + </table><hr/> + <h1 id="Merging">Merging</h1> + <p>A merge incorporates changes from named commits (since the time their histories diverged from the current branch) into the current branch. </p> + <h2 id="Merging_a_branch_or_a_tag_into_the_current_branch">Merging a branch or a tag into the current branch</h2> + <p>Note: Egit currently supports only fast-forward merges (see below).</p> + <p>In the Package Explorer or Navigator, open the context menu on a project node. + Select + <b>Team > Merge...</b> + </p> + <p>Now the merge dialog opens:</p> + <p> + <img border="0" src="images/MergeDialog.png"/> + </p> + <p>On the dialog, select a branch or a tag you want to merge with your current branch. After pressing the Merge button, + the following scenarios can occur:</p> + <ul> + <li>Already up to date: Your current branch points to a commit that has the selected branch or tag as predecessor. In this case nothing is changed.</li> + <li>Fast-forward: Your current branch points to a commit that is a predecessor of the selected branch or tag. In this case your branch is moved and points to the selected branch or tag; this new HEAD is checked out to the working tree. Fast-forward is very common when working with remote repositories: When a remote tracking branch is updated, the merge with the corresponding branch generally is a fast-forward. You can perform a pull by fetching the remote branch (e.g. origin/master) and merging it into the corresponding local branch (e.g. master).</li> + <li>Real merge: When neither of the conditions above apply egit triggers a merge of the commits. This is not implemented yet.</li> + </ul><hr/> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <td style="width: 20%" align="left"> + <a href="Branching.html" title="Branching"> + <img alt="Previous" border="0" src="../../images/prev.gif"/> + </a> + </td> + <td style="width: 60%" align="center"> + <a href="User-Guide.html" title="EGit User Guide"> + <img alt="EGit User Guide" border="0" src="../../images/home.gif"/> + </a> + </td> + <td style="width: 20%" align="right"> + <a href="Tagging.html" title="Tagging"> + <img alt="Next" border="0" src="../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top">Branching</td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Tagging</td> + </tr> + </table> + </body> +</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/Patches.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Patches.html index 4a0d1d6b6f..281c7bede9 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Patches.html +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/Patches.html @@ -12,7 +12,7 @@ </tr> <tr> <td style="width: 20%" align="left"> - <a href="Tags.html" title="Tags"> + <a href="Tagging.html" title="Tagging"> <img alt="Previous" border="0" src="../../images/prev.gif"/> </a> </td> @@ -24,7 +24,7 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">Tags</td> + <td style="width: 20%" align="left" valign="top">Tagging</td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top">Managing Repositories</td> </tr> @@ -32,7 +32,11 @@ <h1 id="Patches">Patches</h1> <h2 id="Creating_Patches">Creating Patches</h2> <p>"A patch is a piece of software designed to fix problems with, or update a computer program or its supporting data" (wikipedia). A patch file contains a description of changes of a set of resources which can be automatically applied to another eclipse workspace or git repository.</p> - <p>The patch formats used by eclipse (Team > Apply Patch) and by git (git apply or git am on the command line) are different. It is possible to create both types of a patch in EGit.</p> + <p>The patch formats used by eclipse ( + <b>Team > Apply Patch</b>) and by git (<tt> + <b>git apply</b></tt> or <tt> + <b>git am</b></tt> on the command line) are different. It is possible to create both types of a patch in EGit. + </p> <h3 id="Create_a_Patch_from_a_Commit">Create a Patch from a Commit</h3> <p>This is the most common use case for a distributed versioning system. A developer commits a change on a local feature or bugfix branch and wants to export this change into a patch file.</p> <p>It can be done from the history view:</p> @@ -47,17 +51,26 @@ </p> <p>The name of the patch file is created from the first line of the commit message.</p> <p>On the second page you can change the patch format. </p> - <p>Currently there is one check box: "Export in git patch format". </p> + <p>Currently there is one check box: + <b>Export in git patch format</b>. + </p> <ul> - <li>If you do not check it (this is the default) the patch can be applied with the eclipse "Apply Patch... " wizard. The paths are relative to the eclipse projects and do not contain prefixes (like "git format-patch --no-prefix" on the git command line).</li> - <li>If you check it the patch will look like the result of "git format-patch --no-stat" on the git command line. </li> + <li>If you do not check it (this is the default) the patch can be applied with the eclipse + <b>Apply Patch...</b> wizard. The paths are relative to the eclipse projects and do not contain prefixes (like <tt> + <b>git format-patch --no-prefix</b></tt> on the git command line). + </li> + <li>If you check it the patch will look like the result of <tt> + <b>git format-patch --no-stat</b></tt> on the git command line. + </li> </ul> <h2 id="Applying_Patches">Applying Patches</h2> - <p>Currently it s not possible to apply patches in git format. It is possible to apply patches using the standard eclipse format using Team > Apply Patch...</p><hr/> + <p>Currently it s not possible to apply patches in git format. It is possible to apply patches using the standard eclipse format using + <b>Team > Apply Patch...</b>. + </p><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"> - <a href="Tags.html" title="Tags"> + <a href="Tagging.html" title="Tagging"> <img alt="Previous" border="0" src="../../images/prev.gif"/> </a> </td> @@ -73,7 +86,7 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">Tags</td> + <td style="width: 20%" align="left" valign="top">Tagging</td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top">Managing Repositories</td> </tr> diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/Perspective-Views-and-Menus.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Perspective-Views-and-Menus.html index 5339a964d6..f49218dd1b 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Perspective-Views-and-Menus.html +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/Perspective-Views-and-Menus.html @@ -30,39 +30,86 @@ </tr> </table><hr/> <h1 id="Perspective.2C_Views_and_Menus">Perspective, Views and Menus</h1> + <h2 id="Git_Perspective">Git Perspective</h2> <p> - <b>Git Perspective</b> - - <br/>"Window" -> "Open Perspective" -> "Git Repository Exploring" opens the Git Repository Exploring perspective + <b>Window > Open Perspective > Git Repository Exploring</b> opens the Git Repository Exploring perspective </p> + <h2 id="Git_Repositories_View">Git Repositories View</h2> <p> - <b>Git Repositories View</b> - - <br/>"Window" -> "Open View" -> "Git" -> "Git Repositories" opens the Git Repositories view which is explained in detail + <b>Window > Open View > Git > Git Repositories</b> opens the Git Repositories view which is explained in detail <a href="Managing-Repositories.html#Managing_Repositories">here</a>. </p> + <h2 id="History_View">History View</h2> <p> - <b>History View</b> - - <br/>"Show In" -> "History View" on the context menu of resources under git version control navigates to the - <a href="Inspecting-the-state-of-the-Repository.html#History_View">History View</a>. + <b>Show In > History View</b> on the context menu of resources under git version control navigates to the + <a href="Perspective-Views-and-Menus.html#History_View">History View</a>. </p> - <p> - <b>Project Context Menu</b> - - <br/> On project nodes in navigation views (Navigator, Package Explorer etc.) the following Git actions are available: + <h2 id="Project_Context_Menu">Project Context Menu</h2> + <p>On project nodes in navigation views (Navigator, Package Explorer etc.) the following Git actions are available for projects shared with the Git team provider: <br/> <img border="0" src="images/Egit-0.8-context-menu-project.png"/> </p> - <p> - <b>Resource Context Menu</b> - - <br/> On resource nodes (files and folders) in navigation views the following Git actions are available: + <h2 id="Resource_Context_Menu">Resource Context Menu</h2> + <p>On resource nodes (files and folders) in navigation views the following Git actions are available for projects shared with the Git team provider: <br/> <img border="0" src="images/Egit-0.8-context-menu-resource.png"/> - </p><hr/> + </p> + <h2 id="Menu_Actions">Menu Actions</h2> + <ul> + <li> + <a href="Committing-Changes.html#Committing_Changes">Commit...</a> + </li> + <li> + <a href="Working-with-remote-Repositories.html#Pushing_to_other_Repositories">Push...</a> + </li> + <li> + <a href="Branching.html#Branching">Branch...</a> + </li> + <li> + <a href="Merging.html#Merging">Merge...</a> + </li> + <li> + <a href="Tagging.html#Tagging">Tag...</a> + </li> + <li> + <a href="Reverting-Changes.html#Resetting_your_current_HEAD">Reset...</a> + </li> + <li> + <b>Refresh</b>: Updates the Git index for the selected resources. Only tracked resources are updated. This will update the index timestamps with the file timestamps. See + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=315306" target="egit_external">bug 315306</a>. + </li> + <li> + <a href="Patches.html#Applying_Patches">Apply Patch...</a> + </li> + <li> + <a href="Working-with-remote-Repositories.html#Fetching_from_other_Repositories">Fetch...</a> + </li> + <li> + <b>Ignore</b>: action to add files to .gitignore. + <b>Note:</b> EGit does not yet respect ignore settings stored in <tt>.gitignore</tt> files. + </li> + <li> + <b>Add</b>: adds changes present in the working tree to the git index, also known as staging changes. See + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=315306" target="egit_external">bug 315306</a>. + </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 > Assume unchanged</b> (or on the command line with <tt>git update-index --assume-unchanged</tt>). Currently it can only be switched back on the command line with <tt>git update-index --no-assume-unchanged</tt>. + </li> + <li> + <b>Untrack</b>: Removes resources from git version control. If you want to delete the resource from the working tree click also + <b>Delete</b> in the resource's context menu. + </li> + <li> + <b>Track</b>: puts newly created resources under git version control. Git does not automatically start tracking resources. See + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=315306" target="egit_external">bug 315306</a>. + </li> + <li> + <b>Disconnect</b>: Disconnects the attached git team provider from this project. + </li> + </ul><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/EGit/User_Guide/Reverting-Changes.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Reverting-Changes.html index 17df7ba54d..487f3b6ddd 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Reverting-Changes.html +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/Reverting-Changes.html @@ -18,7 +18,7 @@ </td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right"> - <a href="Merge.html" title="Merge"> + <a href="Branching.html" title="Branching"> <img alt="Next" border="0" src="../../images/next.gif"/> </a> </td> @@ -26,7 +26,7 @@ <tr> <td style="width: 20%" align="left" valign="top">Committing Changes</td> <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Merge</td> + <td style="width: 20%" align="right" valign="top">Branching</td> </tr> </table><hr/> <h1 id="Reverting_Changes">Reverting Changes</h1> @@ -38,7 +38,10 @@ <img border="0" src="images/ReplaceWithGitIndex.png"/> </p> <h3 id="Replace_with_HEAD">Replace with HEAD</h3> - <p>This feature is currently not available on single file level. You can use "Reset to" with the option "hard" to set the whole working tree of your repository to the state of the HEAD commit (See "Resetting your current HEAD" below). By this you revert all changes in the working tree and the index. You can't do it on a selected set of files yet.</p> + <p>This feature is currently not available on single file level. You can use + <b>Reset to</b> with the option + <b>hard</b> to set the whole working tree of your repository to the state of the HEAD commit (See "Resetting your current HEAD" below). By this you revert all changes in the working tree and the index. You can't do it on a selected set of files yet. + </p> <h2 id="Resetting_your_current_HEAD">Resetting your current HEAD</h2> <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 whole repository.</p> <p>You have the option to do a hard reset, a mixed reset and a soft reset.</p> @@ -54,14 +57,26 @@ </li> </ul> <h3 id="Reset_to_specific_branch_or_tag">Reset to specific branch or tag</h3> - <p>Select "Team -> Reset To..." on a project. This opens a dialog where you can select a branch or a tag. </p> + <p>Select + <b>Team -> Reset...</b> on a project. This opens a dialog where you can select a branch or a tag. + </p> <h3 id="Reset_to_a_specific_commit">Reset to a specific commit</h3> - <p>Select a commit in the History view and open the context menu. Here you find the entries "Hard reset", "Mixed reset" and "Soft reset".</p> + <p>Select a commit in the History view and open the context menu. Here you find the entries + <b>Hard reset</b>, + <b>Mixed reset</b> and + <b>Soft reset</b>. + </p> <h3 id="Revert_all_local_and_staged_changes">Revert all local and staged changes</h3> - <p>This can be done as a special case of reset. If you reset to the current HEAD (normally the last commit on your branch) with the option "hard" you overwrite the working tree and the index with the content of the HEAD. You can do this in two ways:</p> + <p>This can be done as a special case of reset. If you reset to the current HEAD (normally the last commit on your branch) with the option + <b>hard</b> you overwrite the working tree and the index with the content of the HEAD. You can do this in two ways: + </p> <ul> - <li>Select "Team -> Reset To..." on a project. In the dialog select HEAD or your current branch and switch the radio button to "hard".</li> - <li>Open the context menu on the HEAD commit in the history view and select "Hard Reset".</li> + <li>Select + <b>Team > Reset...</b> on a project. In the dialog select HEAD or your current branch and switch the radio button to "hard". + </li> + <li>Open the context menu on the HEAD commit in the history view and select + <b>Hard Reset</b>. + </li> </ul><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> @@ -76,7 +91,7 @@ </a> </td> <td style="width: 20%" align="right"> - <a href="Merge.html" title="Merge"> + <a href="Branching.html" title="Branching"> <img alt="Next" border="0" src="../../images/next.gif"/> </a> </td> @@ -84,7 +99,7 @@ <tr> <td style="width: 20%" align="left" valign="top">Committing Changes</td> <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Merge</td> + <td style="width: 20%" align="right" valign="top">Branching</td> </tr> </table> </body> diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/Starting-from-existing-Git-Repositories.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Starting-from-existing-Git-Repositories.html index b454b46f28..606db621de 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Starting-from-existing-Git-Repositories.html +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/Starting-from-existing-Git-Repositories.html @@ -32,10 +32,14 @@ <h1 id="Starting_from_existing_Git_Repositories">Starting from existing Git Repositories</h1> <p>In order to work with the contents of a Git Repository in the Eclipse workbench, the files and folders contained in this repository must be imported in the form of projects. In principle, this import step 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> <h2 id="Starting_the_import_wizard">Starting the import wizard</h2> - <p>The wizard is started using</p> - <pre>Import -> Git -> Projects from GIT -</pre> - <p> + <p>The wizard is started using + + <br/> + + <b>Import > Git > Projects from Git</b> + + <br/> + <img border="0" src="images/ImportProjectWizard.png"/> </p> <p>If you started in a clean workspace, the first page will display an empty list:</p> @@ -51,18 +55,25 @@ <li>Add an existing Repository from your local file system</li> </ol> <h3 id="Cloning_a_Repository">Cloning a Repository</h3> - <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. The Clone wizard is started using the "Clone..." button next to the Repository list. The Clone wizard is described in more detail elsewhere. Upon successful completion of the clone wizard, the newly cloned Repository should appear in the list automatically.</p> + <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. The Clone wizard is started using the + <b>Clone...</b> button next to the Repository list. The Clone wizard is described in more detail elsewhere. Upon successful completion of the clone wizard, the newly cloned Repository should appear in the list automatically. + </p> <h3 id="Adding_a_Repository">Adding a Repository</h3> - <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. Clicking on the "Add..." button next to the Repository list, a dialog is displayed which allows to enter a directory in the local file system. Press "Search" to trigger a scan for Git Repositories contained in this directory. If Git Repositories are found, they will be shown in a list and you can select Repositories to add:</p> + <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. Clicking on the + <b>Add...</b> button next to the Repository list, a dialog is displayed which allows to enter 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 shown in a list and you can select repositories to add: + </p> <p> <img border="0" src="images/ImportProjectAddDialog.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/ImportProjectFilledList.png"/> </p> - <h2 id="Selecting_a_Repository_from_the_list">Selecting a Repository from the list</h2> - <p>You can now select a Repository and hit "Next". On the following wizard page, you will have to decide:</p> + <h2 id="Selecting_a_Repository_from_the_List">Selecting a Repository from the List</h2> + <p>You can now select a Repository and click + <b>Next</b>. On the following wizard page, you will have to decide: + </p> <ul> <li>How to do the import</li> <li>How to share the imported projects:</li> @@ -73,34 +84,38 @@ </p> <h2 id="Method_for_importing_Projects">Method for importing Projects</h2> <h3 id="Import_Existing_Projects">Import Existing Projects</h3> - <p>If this radio button is selected, the wizard will scan the local file system for .project files and display the projects found for being imported. This is the most comfortable solution and should be used if .project files are checked into the Repository.</p> - <h4 id="Limiting_the_scope_for_project_import">Limiting the scope for project import</h4> - <p>In this case, the directory tree at the bottom is active. You can limit the search for .project 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 "Import Existing Projects" wizard, but has some additional filtering capabilities:</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> + <h4 id="Limiting_the_Scope_for_Project_Import">Limiting the Scope for Project Import</h4> + <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: + </p> <p> <img border="0" src="images/ImportProjectProjectList.png"/> </p> - <h3 id="Use_the_New_Projects_wizard">Use the New Projects wizard</h3> + <h3 id="Use_the_New_Projects_Wizard">Use the New Projects Wizard</h3> <p>When this option is chosen, this wizard branches to the generic "New Project" wizard. After completion of the "New Project" wizard, this wizard will resume and help you with sharing the newly created projects (if any) created using the "New Project" wizard.</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> <h3 id="Import_as_General_Project">Import as General Project</h3> - <p>This option can be helpful when there are neither .project files available nor a suitable "New Project" wizard applies to the content of the Git Repository. If chosen, the wizard will generate a .project file and point the project to a folder of the Repository's working directory. The result is a "General Project".</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>When clicking "Next" you will see a simple dialog suggesting a name and a directory for the new project:</p> + <p>When clicking + <b>Next</b> you will see a simple dialog suggesting a name and a directory for the new project: + </p> <p> <img border="0" src="images/ImportProjectNewGeneralProject.png"/> </p> - <p>The name will be suggested to be the same as the name of the directory. </p> - <h2 id="Method_for_sharing_imported_Projects">Method for sharing imported Projects</h2> + <p>The name will be suggested to be the same as the name of the directory.</p> + <h2 id="Method_for_Sharing_Imported_Projects">Method for Sharing Imported Projects</h2> <p>The newly created projects (if any) must be shared with the correct Git Repository in order to become part of the Git Team Provider. The following options for doing this share are provided:</p> - <h3 id="Try_to_share_newly_created_projects_automatically">Try to share newly created projects automatically</h3> + <h3 id="Try_to_Share_Newly_Created_Projects_Automatically">Try to Share Newly Created Projects Automatically</h3> <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 manually.</p> - <h3 id="Share_new_projects_interactively">Share new projects interactively</h3> + <h3 id="Share_New_Projects_Interactively">Share New Projects Interactively</h3> <p>This might be useful for very special circumstances where the automatic detection fails. Note that this will block the UI until 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/ImportProjectShareProject.png"/> </p> - <h3 id="Do_not_share_new_projects">Do not share new projects</h3> + <h3 id="Do_Not_Share_New_Projects">Do Not Share New Projects</h3> <p>This may be helpful if you want to share projects manually for some reason.</p><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/Tagging.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Tagging.html new file mode 100644 index 0000000000..5450074b9f --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/Tagging.html @@ -0,0 +1,107 @@ +<?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 User Guide - Tagging</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">Tagging</th> + </tr> + <tr> + <td style="width: 20%" align="left"> + <a href="Merging.html" title="Merging"> + <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="Patches.html" title="Patches"> + <img alt="Next" border="0" src="../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top">Merging</td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Patches</td> + </tr> + </table><hr/> + <h1 id="Tagging">Tagging</h1> + <h2 id="Creating_a_Tag">Creating a Tag</h2> + <ul> + <li>Select + <b>Team > Tag...</b> from the project context menu. + </li> + </ul> + <p> + <img border="0" src="images/Egit-0.8-tag-create.png"/> + </p> + <ul> + <li>Enter the tag name</li> + <li>Enter the tag message</li> + <li>Optionally select the commit you want to tag (default is HEAD)</li> + <li>Click + <b>OK</b> to create the annotated tag + </li> + </ul> + <h2 id="Replacing_an_Existing_Tag">Replacing an Existing Tag</h2> + <p>What to do if you tagged the wrong commit or ended up with some sort of typo ?</p> + <ul> + <li>If you didn't yet push this out just replace the tag and you are done.</li> + <li> + <b>If it's already published you shouldn't replace the tag</b> but use a new name since otherwise you have to tell everybody who got the old tag to replace it manually with your updated one. This is because, Git does not (and it should not) change tags behind users back. So if somebody already got the old tag, doing a git pull on your tree shouldn't just make them overwrite the old one.}} + </li> + </ul> + <p>So if your old tag wasn't yet pushed you may correct it in the following way :</p> + <ul> + <li>Select + <b>Team > Tag...</b> from the project context menu. + </li> + </ul> + <p> + <img border="0" src="images/Egit-0.8-tag-replace.png"/> + </p> + <ul> + <li>Select the tag you want to replace from the list of existing tags</li> + <li>or start typing any part of the tag you look for into the Tag Name field, this will filter the list of existing tags to those tags which contain the string you are typing, then select the tag you want to replace</li> + <li>Mark the checkbox + <b>Force replace existing tag</b> + </li> + <li>Change the tag and press + <b>OK</b> + </li> + </ul> + <h2 id="Light-weight_and_Signed_Tags">Light-weight and Signed Tags</h2> + <p>Light-weight and 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> as a workaround + </p><hr/> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <td style="width: 20%" align="left"> + <a href="Merging.html" title="Merging"> + <img alt="Previous" border="0" src="../../images/prev.gif"/> + </a> + </td> + <td style="width: 60%" align="center"> + <a href="User-Guide.html" title="EGit User Guide"> + <img alt="EGit User Guide" border="0" src="../../images/home.gif"/> + </a> + </td> + <td style="width: 20%" align="right"> + <a href="Patches.html" title="Patches"> + <img alt="Next" border="0" src="../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top">Merging</td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Patches</td> + </tr> + </table> + </body> +</html>
\ No newline at end of file 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 a66417f9e5..57af5f75a7 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 @@ -25,19 +25,27 @@ <td style="width: 20%" align="right" valign="top">Perspective, Views and Menus</td> </tr> </table><hr/> - <h1 id="Getting_Started_-_Adding_a_project_to_version_control">Getting Started - Adding a project to version control</h1> + <h1 id="Getting_Started">Getting Started</h1> + <h2 id="Overview">Overview</h2> <p>If you're new to Git or distributed version control systems generally, then you might want to read - <a href="../../\EGit\Git_For_Eclipse_Users/Git-For-Eclipse-Users.html" title="EGit/Git For Eclipse Users">Git for Eclipse Users</a> first. + <a href="../../\EGit\Git_For_Eclipse_Users/Git-For-Eclipse-Users.html" title="EGit/Git For Eclipse Users">Git for Eclipse Users</a> first. If you need more details and background read the + <a href="http://book.git-scm.com" target="egit_external">Git Community Book</a>. </p> + <h2 id="Adding_a_project_to_version_control">Adding a project to version control</h2> <p>Create a new Java project "HelloWorld" </p> <p> <img border="0" src="images/01-CreateNewJavaProject.png"/> </p> - <p>Select "File" -> "Team" -> "Share Project" </p> + <p>Select + <b>File > Team > Share Project</b> + </p> <p> <img border="0" src="images/02-TeamShareProject.png"/> </p> - <p>Select repository type "Git" and click "Next" </p> + <p>Select repository type + <b>Git</b> and click + <b>Next</b> + </p> <p> <img border="0" src="images/03-SelectRepositoryTypeGit.png"/> </p> @@ -45,33 +53,44 @@ <p> <img border="0" src="images/04-SelectProjectToConfigureGitRepository.png"/> </p> - <p>Click "Create" to initialize a new Git repository for the HelloWorld project. If your project already resides in the working tree of an exisiting GIT repository the repository is chosen automatically. </p> + <p>Click + <b>Create</b> to initialize a new Git repository for the HelloWorld project. If your project already resides in the working tree of an exisiting Git repository the repository is chosen automatically. + </p> <p> <img border="0" src="images/05-CreateNewGitRepository.png"/> </p> - <p>Click "Finish" to close the wizard. </p> - <p>The decorator text " - <a href="master">master</a>" behind the project shows that this project is tracked in a repository on the master branch and the question mark decorators show that the ".classpath" and ".project" files are not yet under version control + <p>Click + <b>Finish</b> to close the wizard. </p> + <p>The decorator text "[master]" behind the project shows that this project is tracked in a repository on the master branch and the question mark decorators show that the ".classpath" and ".project" files are not yet under version control </p> <p> <img border="0" src="images/06-NewGitRepository.png"/> </p> - <p>Select "Team" -> "Add to version control" on the project node </p> + <p>Select + <b>Team > Track</b> on the project node + </p> <p> <img border="0" src="images/07-AddToVersionControl.png"/> </p> <p>The plus decorators show that now the ".classpath" and ".project" files are added to version control </p> <p>Create a file .gitignore in the project folder with the following content: </p> <p>bin </p> - <p>This excludes the bin folder from GIT's list of untracked files. Add .gitignore to version control. </p> + <p>This excludes the bin folder from Git's list of untracked files. Add .gitignore to version control. </p> <p> <img border="0" src="images/08-AddedToVersionControl.png"/> </p> - <p>The file under ".settings" is not added to version control since it is by default on the list of ignored resources which can be changed in "Preferences" -> "Team" -> "Ignored Resources" </p> + <p>The file under ".settings" is not added to version control since it is by default on the list of ignored resources which can be changed in + + <br/> + + <b>Preferences > Team > Ignored Resources</b> + </p> <p> <img border="0" src="images/09-IgnoredResources.png"/> </p> - <p>Select "Team" -> "Commit" from the context menu on the project </p> + <p>Click + <b>Team > Commit</b> in the project context menu + </p> <p> <img border="0" src="images/10-ClickCommit.png"/> </p> @@ -83,7 +102,9 @@ <p> <img border="0" src="images/12-CommittedFiles.png"/> </p> - <p>Select "Team" -> "Show in Resource History" from the context menu to inspect the history of a resource </p> + <p>Select + <b>Show In > History</b> from the context menu to inspect the history of a resource + </p> <p> <img border="0" src="images/13-SelectResourceHistory.png"/> </p> diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/Working-with-remote-Repositories.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Working-with-remote-Repositories.html index 9c726125a1..c87562bf83 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Working-with-remote-Repositories.html +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/Working-with-remote-Repositories.html @@ -30,12 +30,17 @@ </tr> </table><hr/> <h1 id="Working_with_remote_Repositories">Working with remote Repositories</h1> - <h2 id="Cloning_remote_Repositories">Cloning remote Repositories</h2> - <p>Using the Git clone wizard you may clone remote repositories using different transport protocols. </p> - <p>The wizard can be started from the "Import Projects from Git" wizard using </p> - <pre>Import... -> Git -> Projects from Git -> Next -> Clone... -</pre> - <p>or from the "Git Repositories View" (described elsewhere) using the "Clone a Git Repository" toolbar button. </p> + <h2 id="Cloning_Remote_Repositories">Cloning Remote Repositories</h2> + <p>Using the Git Clone Wizard you may clone remote repositories using different transport protocols. </p> + <p>The wizard can be started from the "Import Projects from Git" wizard using + + <br/> + + <b>Import... > Git > Projects from Git > Next > Clone...</b> + </p> + <p>or from the "Git Repositories View" (described elsewhere) using the + <b>Clone a Git Repository</b> toolbar button. + </p> <h3 id="Repository_Selection">Repository Selection</h3> <p>On the first page of the wizard enter the location of the remote repository: </p> <p> @@ -44,7 +49,8 @@ <ul> <li> <b>URI</b> - The complete URI of the remote repository or the path on the file system. This field is automatically synchronized with the other fields. - <br/>Note that you can use the "Local file..." button to browse for a local directory and that the URI field offers content assist by offering previously used values + <br/>Note that you can use the + <b>Local file...</b> button to browse for a local directory and that the URI field offers content assist by offering previously used values </li> <li> <b>Host</b> - The name of the remote host or empty if cloning from the file system. @@ -94,7 +100,7 @@ <b>file</b> - File system access to the repository. </li> </ul> - <h3 id="Branch_selection">Branch selection</h3> + <h3 id="Branch_Selection">Branch Selection</h3> <p>On the next page choose which branch should be cloned from the remote repository: </p> <p> <img border="0" src="images/05-branches.png"/> @@ -115,9 +121,158 @@ <b>Remote name</b> - Define a name for the remote repository. The default is "origin". </li> </ul> + <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> + </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/"</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. + </p> + <ul> + <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>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> <h2 id="Pushing_to_other_Repositories">Pushing to other Repositories</h2> - <p>TBD</p> - <h3 id="Pushing_a_Local_Repository_to_GitHub">Pushing a Local Repository to GitHub</h3> + <h3 id="Direct_Push">Direct Push</h3> + <p>The easiest way for pushing is to use + <a href="Managing-Repositories.html#Direct_Fetch_and_Push_Support">Direct Push Support</a> on a Push Specification of a Remote. + </p> + <h3 id="Push_Wizard">Push Wizard</h3> + <p>The other way is using the Push Wizard + + <br/> + + <b>Team > Push...</b> + </p> + <h4 id="Push_URI">Push URI</h4> + <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>. + </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.8-push-to-uri.png"/> + </p> + <h4 id="Push_Ref_Specifications">Push Ref Specifications</h4> + <p> + <br/> + Click + <b>Next</b> + + <br/> + Click + <b>Add all branches spec</b> + </p> + <p> + <img border="0" src="images/Egit-0.8-push-wizard.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. + </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>click + <b>Add spec</b> + </li> + </ul> + <p>This will transfer the newly defined mapping to the list + <b>Specifications for push</b> + </p> + <p> + <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. + </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> + <h4 id="Delete_Ref_Specifications">Delete Ref Specifications</h4> + <p>To delete a ref in the destination repository select the ref to be deleted from the drop-down list + <b>Remote ref to delete</b> + and click + <b>Add spec</b>. This will create a corresponding entry in the + <b>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.8-push-ref-delete.png"/> + </p> + <h4 id="Conflicting_Push_Ref_Specifications">Conflicting Push Ref Specifications</h4> + <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> + </p> + <p> + <img border="0" src="images/Egit-0.8-push-conflicting-specs.png"/> + </p> + <h4 id="Push_Confirmation">Push Confirmation</h4> + <p>Click + <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 + <b>Back</b> and correct your push specs accordingly. + </p> + <ul> + <li>For ref updates the range of commits to be pushed will be shown in the format <tt> + <b><SHA1-from>..<SHA1-to></b></tt> e.g. <tt> + <b>d97f5a2e..adfdbfd2</b></tt> means all commits between <tt> + <b>d97f5a2e</b></tt> and <tt> + <b>adfdbfd2</b></tt> will be pushed. + </li> + <li>For refs which do not yet exist in the destination repository <tt> + <b>[new branch]</b></tt> or <tt> + <b>[new tag]</b></tt> is displayed. + </li> + <li>For refs which will be delete <tt> + <b>[deleted]</b></tt> is shown. + </li> + </ul> + <p> + <img border="0" src="images/Egit-0.8-push-confirmation.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. + </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. + </li> + </ul> + <h4 id="Push_Result_Report">Push Result Report</h4> + <p>Click + <b>Finish</b> + </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.8-push-result.png"/> + </p> + <p>Click + <b>Ok</b> to close the dialog. + </p> + <h3 id="Example:_Pushing_a_Local_Repository_to_GitHub">Example: Pushing a Local Repository to GitHub</h3> <h4 id="Create_Local_Repository">Create Local Repository</h4> <ul> <li>follow @@ -139,68 +294,202 @@ </p> <h4 id="Eclipse_SSH_Configuration">Eclipse SSH Configuration</h4> <ul> - <li>open "Window" > "Preferences" and ensure that your SSH2 home is configured correctly (usually this is ~/.ssh) and contains your SSH2 keys (upload your public key to your GitHub account settings)</li> + <li>Click + <b>Window > Preferences</b> and ensure that your SSH2 home is configured correctly (usually this is <tt>~/.ssh</tt>) and contains your SSH2 keys (upload your public key to your GitHub account settings) + </li> </ul> <p> <img border="0" src="images/Egit-0.6-003-SshPreferences.png"/> </p> <ul> - <li>if you don't have SSH keys yet you may generate them on the second tab "Key Management" of this dialog, use a good pass phrase to protect your private key, for more details see + <li>if you don't have SSH keys yet you may generate them on the second tab + <b>Key Management</b> of this dialog, use a good pass phrase to protect your private key, for more details see <a href="http://help.github.com/working-with-key-passphrases/" target="egit_external">"working with key passphrases"</a> </li> </ul> <h4 id="Push_Upstream">Push Upstream</h4> <ul> - <li>Select your new Eclipse project and click "Team" > "Push To" and enter "Your GitHub Clone URL" and your GitHub password(with the free github accoutns do not enter a password but leave blank), leave the user as "git"</li> + <li>Select your new Eclipse project and click + <b>Team > Push...</b>. + </li> + <li>Enter + <b>Your GitHub Clone URL</b> and your GitHub password (with the free github accounts do not enter a password but leave this field blank), leave the user as <tt>git</tt>. + </li> </ul> <p> <img border="0" src="images/Egit-0.6-004-PushDialog.png"/> </p> <ul> - <li>click "Next" and on first connection accept GitHub's host key</li> + <li>Click + <b>Next</b> and on first connection accept GitHub's host key. + </li> </ul> <p> <img border="0" src="images/Egit-0.6-005-AcceptHostKey.png"/> </p> <ul> - <li>enter your SSH key's passphrase</li> + <li>Enter your SSH key's passphrase.</li> </ul> <p> <img border="0" src="images/Egit-0.6-006-PassPhrase.png"/> </p> <ul> - <li>click button "Add all branches spec"</li> + <li>Click + <b>Add all branches spec</b> to map your local branch names 1:1 to the same branch names in the destination repository. + </li> </ul> <p> <img border="0" src="images/Egit-0.6-007-PushRefSpecifications.png"/> </p> <ul> - <li>click "Next" and click "Finish" to confirm the push</li> + <li>Click + <b>Next</b>. The push confirmation dialog will show a preview of the changes that will be pushed to the destination repository. + </li> + <li>Click + <b>Finish</b> to confirm that you want to push these changes. + </li> </ul> <p> <img border="0" src="images/Egit-0.6-008-PushConfirmation.png"/> </p> <ul> - <li>the next dialog shows the result of the push operation</li> + <li>The next dialog reports the result of the push operation.</li> </ul> <p> <img border="0" src="images/Egit-0.6-009-PushResult.png"/> </p> <ul> - <li>point your browser at your GitHub repository to see that your new repository content has arrived</li> + <li>Point your browser at your GitHub repository to see that your new repository content has arrived</li> </ul> <p> <img border="0" src="images/Egit-0.6-010-PushResultOnGithub.png"/> </p> <h2 id="Fetching_from_other_Repositories">Fetching from other Repositories</h2> - <p>TBD</p> - <h2 id="Pulling_.28merge_or_rebase.29_new_changes_from_Upstream_Repositories">Pulling (merge or rebase) new changes from Upstream Repositories</h2> - <p>This is not yet available. Available alternatives currently include: </p> + <h3 id="Direct_Fetch">Direct Fetch</h3> + <p>The easiest way for fetching is to use + <a href="Managing-Repositories.html#Direct_Fetch_and_Push_Support">Direct Fetch Support</a> on a Fetch Specification of a Remote. + </p> + <h3 id="Fetch_Wizard">Fetch Wizard</h3> + <p>The other way is using the Fetch Wizard + + <br/> + + <b>Team > Fetch...</b> + </p> + <ul> + <li>If you already configured a Fetch Specification in the Repositories View you may also select it here using the drop-down list under + <b>Configured remote repositories</b>. + </li> + </ul> + <p> + <img border="0" src="images/Egit-0.8-fetch-from-fetch-spec.png"/> + </p> + <ul> + <li>Otherwise click + <b>Custom URI</b> and enter the URI of the upstream repository you want to fetch changes from. + </li> + </ul> + <p> + <img border="0" src="images/Egit-0.8-fetch-from-uri.png"/> + </p> + <h4 id="Fetch_Ref_Specifications">Fetch Ref Specifications</h4> + <p>Click + <b>Next</b> + + <br/> + Click + <b>Add all branches spec</b> + </p> + <p> + <img border="0" src="images/Egit-0.8-fetch-spec.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> - <li>run "git pull" from outside eclipse (but + <li>Click in the edit field + <b>Destination Ref</b> and replace the path segment + <i>choose_remote_name</i> with a symbolic name for the upstream repository you are going to fetch from. + </li> + <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>. + </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>. + </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. + </li> + <li>Click + <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 + <b>Specifications for fetch</b> + </li> + </ul> + <ul> + <li>Click + <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> + <ul> + <li>enter source (ref in source repository) and destination ref (tracking branch or tag in local repository) or select already existing branches from the drop-down lists</li> + <li>click + <b>Add spec</b> + </li> + </ul> + <p>This will transfer the newly defined mapping to the list + <b>Specifications for fetch</b> + </p> + <h4 id="Fetch_Result_Report">Fetch Result Report</h4> + <p>Click + <b>Finish</b> + </p> + <p> + <img border="0" src="images/Egit-0.8-fetch-result.png"/> + </p> + <p>A fetch result dialog is shown.</p> + <ul> + <li>For ref updates the range of commits which have been fetched will be shown in the format <tt> + <b><SHA1-from>..<SHA1-to></b></tt> e.g. <tt> + <b>d97f5a2e..adfdbfd2</b></tt> means all commits between <tt> + <b>d97f5a2e</b></tt> and <tt> + <b>adfdbfd2</b></tt> have been fetched. + </li> + <li>For refs which didn't exist before in the local repository <tt> + <b>[new branch]</b></tt> or <tt> + <b>[new tag]</b></tt> is displayed. + </li> + <li>For refs which have been deleted <tt> + <b>[deleted]</b></tt> is shown. + </li> + </ul> + <h2 id="Pulling_New_Changes_from_Upstream_Repositories">Pulling New Changes from Upstream Repositories</h2> + <p>This is not yet fully available. </p> + <p>In cases where fast-forward merges are sufficient (full merge is not yet implemented) you may run pull in EGit in the following way:</p> + <ul> + <li> + <a href="Working-with-remote-Repositories.html#Fetching_from_other_Repositories">Fetch changes</a> from upstream repository + </li> + <li> + <a href="Managing-Repositories.html#Check-out_of_Branches_and_Tags">Checkout the branch</a> you want to pull the upstream changes into + </li> + <li> + <a href="Merging.html#Merging_a_branch_or_a_tag_into_the_current_branch">Merge</a> the branch or tag you want to integrate into your current branch + </li> + </ul> + <p>Available alternatives currently include: </p> + <ul> + <li>run + <b>git pull</b> from outside eclipse (but <a href="http://marc.info/?l=git&m=123924844219075" target="egit_external">beware on Windows</a>) </li> - <li>if you did no local change or want to discard your local changes, use "Team/Reset To..."</li> + <li>if you did no local change or want to discard your local changes, use + <b>Team > Reset...</b> + </li> </ul><hr/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/07-AddToVersionControl.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/07-AddToVersionControl.png Binary files differindex 7fc1179960..c1ff648c0b 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/07-AddToVersionControl.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/07-AddToVersionControl.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/10-ClickCommit.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/10-ClickCommit.png Binary files differindex fed2098936..8ae430c964 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/10-ClickCommit.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/10-ClickCommit.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/13-SelectResourceHistory.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/13-SelectResourceHistory.png Binary files differindex accaaae48e..be55d75869 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/13-SelectResourceHistory.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/13-SelectResourceHistory.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-branch-dialog.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-branch-dialog.png Binary files differnew file mode 100644 index 0000000000..9d323f3c1a --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-branch-dialog.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-context-menu-project.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-context-menu-project.png Binary files differindex db3c173c4d..05f07fb649 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-context-menu-project.png +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-context-menu-project.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-fetch-from-fetch-spec.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-fetch-from-fetch-spec.png Binary files differnew file mode 100644 index 0000000000..e6d065da26 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-fetch-from-fetch-spec.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-fetch-from-uri.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-fetch-from-uri.png Binary files differnew file mode 100644 index 0000000000..ea70cbd5e3 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-fetch-from-uri.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-fetch-result.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-fetch-result.png Binary files differnew file mode 100644 index 0000000000..e07a5baa63 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-fetch-result.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-fetch-spec.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-fetch-spec.png Binary files differnew file mode 100644 index 0000000000..f698c1dab2 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-fetch-spec.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-confirmation.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-confirmation.png Binary files differnew file mode 100644 index 0000000000..db83a2918b --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-confirmation.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-conflicting-specs.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-conflicting-specs.png Binary files differnew file mode 100644 index 0000000000..9ce6247093 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-conflicting-specs.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-ref-delete.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-ref-delete.png Binary files differnew file mode 100644 index 0000000000..2b20c7ccdb --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-ref-delete.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-result.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-result.png Binary files differnew file mode 100644 index 0000000000..790cfd5ff0 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-result.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-to-uri.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-to-uri.png Binary files differnew file mode 100644 index 0000000000..a42d6c4adc --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-to-uri.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-wizard.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-wizard.png Binary files differnew file mode 100644 index 0000000000..566ec2ecb4 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.8-push-wizard.png diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Stop.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Stop.png Binary files differnew file mode 100644 index 0000000000..50c43021d9 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Stop.png diff --git a/org.eclipse.egit.doc/help/toc.xml b/org.eclipse.egit.doc/help/toc.xml index 7824822764..919040c96b 100644 --- a/org.eclipse.egit.doc/help/toc.xml +++ b/org.eclipse.egit.doc/help/toc.xml @@ -1,133 +1,177 @@ <?xml version='1.0' encoding='utf-8' ?> -<toc topic="help/EGit/User_Guide/User-Guide.html" label="EGit Documentation"> - <topic href="help/EGit/User_Guide/User-Guide.html" label="EGit User Guide"> - <topic href="help/EGit/User_Guide/User-Guide.html" label="Getting Started - Adding a project to version control"></topic> - <topic href="help/EGit/User_Guide/Perspective-Views-and-Menus.html" label="Perspective, Views and Menus"></topic> - <topic href="help/EGit/User_Guide/Creating-Repositories.html" label="Creating Repositories"> - <topic href="help/EGit/User_Guide/Creating-Repositories.html#Creating_a_new_empty_Git_Repository" label="Creating a new empty Git Repository"></topic> - <topic href="help/EGit/User_Guide/Creating-Repositories.html#Creating_a_Git_Repository_for_multiple_Projects" label="Creating a Git Repository for multiple Projects"></topic> +<toc topic="help//EGit/User_Guide/User-Guide.html" label="EGit Documentation"> + <topic href="help//EGit/User_Guide/User-Guide.html" label="EGit User Guide"> + <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#Adding_a_project_to_version_control" label="Adding a project to version control"></topic> </topic> - <topic href="help/EGit/User_Guide/Starting-from-existing-Git-Repositories.html" label="Starting from existing Git Repositories"> - <topic href="help/EGit/User_Guide/Starting-from-existing-Git-Repositories.html#Starting_the_import_wizard" label="Starting the import wizard"></topic> - <topic href="help/EGit/User_Guide/Starting-from-existing-Git-Repositories.html#Cloning_or_adding_Repositories" label="Cloning or adding Repositories"> - <topic href="help/EGit/User_Guide/Starting-from-existing-Git-Repositories.html#Cloning_a_Repository" label="Cloning a Repository"></topic> - <topic href="help/EGit/User_Guide/Starting-from-existing-Git-Repositories.html#Adding_a_Repository" label="Adding a Repository"></topic> - </topic> - <topic href="help/EGit/User_Guide/Starting-from-existing-Git-Repositories.html#Selecting_a_Repository_from_the_list" label="Selecting a Repository from the list"></topic> - <topic href="help/EGit/User_Guide/Starting-from-existing-Git-Repositories.html#Method_for_importing_Projects" label="Method for importing Projects"> - <topic href="help/EGit/User_Guide/Starting-from-existing-Git-Repositories.html#Import_Existing_Projects" label="Import Existing Projects"> - <topic href="help/EGit/User_Guide/Starting-from-existing-Git-Repositories.html#Limiting_the_scope_for_project_import" label="Limiting the scope for project import"></topic> + <topic href="help//EGit/User_Guide/Perspective-Views-and-Menus.html" label="Perspective, Views and Menus"> + <topic href="help//EGit/User_Guide/Perspective-Views-and-Menus.html#Git_Perspective" label="Git Perspective"></topic> + <topic href="help//EGit/User_Guide/Perspective-Views-and-Menus.html#Git_Repositories_View" label="Git Repositories View"></topic> + <topic href="help//EGit/User_Guide/Perspective-Views-and-Menus.html#History_View" label="History View"></topic> + <topic href="help//EGit/User_Guide/Perspective-Views-and-Menus.html#Project_Context_Menu" label="Project Context Menu"></topic> + <topic href="help//EGit/User_Guide/Perspective-Views-and-Menus.html#Resource_Context_Menu" label="Resource Context Menu"></topic> + <topic href="help//EGit/User_Guide/Perspective-Views-and-Menus.html#Menu_Actions" label="Menu Actions"></topic> + </topic> + <topic href="help//EGit/User_Guide/Creating-Repositories.html" label="Creating Repositories"> + <topic href="help//EGit/User_Guide/Creating-Repositories.html#Creating_a_new_empty_Git_Repository" label="Creating a new empty Git Repository"></topic> + <topic href="help//EGit/User_Guide/Creating-Repositories.html#Creating_a_Git_Repository_for_multiple_Projects" label="Creating a Git Repository for multiple Projects"></topic> + </topic> + <topic href="help//EGit/User_Guide/Starting-from-existing-Git-Repositories.html" label="Starting from existing Git Repositories"> + <topic href="help//EGit/User_Guide/Starting-from-existing-Git-Repositories.html#Starting_the_import_wizard" label="Starting the import wizard"></topic> + <topic href="help//EGit/User_Guide/Starting-from-existing-Git-Repositories.html#Cloning_or_adding_Repositories" label="Cloning or adding Repositories"> + <topic href="help//EGit/User_Guide/Starting-from-existing-Git-Repositories.html#Cloning_a_Repository" label="Cloning a Repository"></topic> + <topic href="help//EGit/User_Guide/Starting-from-existing-Git-Repositories.html#Adding_a_Repository" label="Adding a Repository"></topic> + </topic> + <topic href="help//EGit/User_Guide/Starting-from-existing-Git-Repositories.html#Selecting_a_Repository_from_the_List" label="Selecting a Repository from the List"></topic> + <topic href="help//EGit/User_Guide/Starting-from-existing-Git-Repositories.html#Method_for_importing_Projects" label="Method for importing Projects"> + <topic href="help//EGit/User_Guide/Starting-from-existing-Git-Repositories.html#Import_Existing_Projects" label="Import Existing Projects"> + <topic href="help//EGit/User_Guide/Starting-from-existing-Git-Repositories.html#Limiting_the_Scope_for_Project_Import" label="Limiting the Scope for Project Import"></topic> </topic> - <topic href="help/EGit/User_Guide/Starting-from-existing-Git-Repositories.html#Use_the_New_Projects_wizard" label="Use the New Projects wizard"></topic> - <topic href="help/EGit/User_Guide/Starting-from-existing-Git-Repositories.html#Import_as_General_Project" label="Import as General Project"></topic> + <topic href="help//EGit/User_Guide/Starting-from-existing-Git-Repositories.html#Use_the_New_Projects_Wizard" label="Use the New Projects Wizard"></topic> + <topic href="help//EGit/User_Guide/Starting-from-existing-Git-Repositories.html#Import_as_General_Project" label="Import as General Project"></topic> </topic> - <topic href="help/EGit/User_Guide/Starting-from-existing-Git-Repositories.html#Method_for_sharing_imported_Projects" label="Method for sharing imported Projects"> - <topic href="help/EGit/User_Guide/Starting-from-existing-Git-Repositories.html#Try_to_share_newly_created_projects_automatically" label="Try to share newly created projects automatically"></topic> - <topic href="help/EGit/User_Guide/Starting-from-existing-Git-Repositories.html#Share_new_projects_interactively" label="Share new projects interactively"></topic> - <topic href="help/EGit/User_Guide/Starting-from-existing-Git-Repositories.html#Do_not_share_new_projects" label="Do not share new projects"></topic> + <topic href="help//EGit/User_Guide/Starting-from-existing-Git-Repositories.html#Method_for_Sharing_Imported_Projects" label="Method for Sharing Imported Projects"> + <topic href="help//EGit/User_Guide/Starting-from-existing-Git-Repositories.html#Try_to_Share_Newly_Created_Projects_Automatically" label="Try to Share Newly Created Projects Automatically"></topic> + <topic href="help//EGit/User_Guide/Starting-from-existing-Git-Repositories.html#Share_New_Projects_Interactively" label="Share New Projects Interactively"></topic> + <topic href="help//EGit/User_Guide/Starting-from-existing-Git-Repositories.html#Do_Not_Share_New_Projects" label="Do Not Share New Projects"></topic> </topic> </topic> - <topic href="help/EGit/User_Guide/Working-with-remote-Repositories.html" label="Working with remote Repositories"> - <topic href="help/EGit/User_Guide/Working-with-remote-Repositories.html#Cloning_remote_Repositories" label="Cloning remote Repositories"> - <topic href="help/EGit/User_Guide/Working-with-remote-Repositories.html#Repository_Selection" label="Repository Selection"></topic> - <topic href="help/EGit/User_Guide/Working-with-remote-Repositories.html#Branch_selection" label="Branch selection"></topic> - <topic href="help/EGit/User_Guide/Working-with-remote-Repositories.html#Local_Destination" label="Local Destination"></topic> - </topic> - <topic href="help/EGit/User_Guide/Working-with-remote-Repositories.html#Pushing_to_other_Repositories" label="Pushing to other Repositories"> - <topic href="help/EGit/User_Guide/Working-with-remote-Repositories.html#Pushing_a_Local_Repository_to_GitHub" label="Pushing a Local Repository to GitHub"> - <topic href="help/EGit/User_Guide/Working-with-remote-Repositories.html#Create_Local_Repository" label="Create Local Repository"></topic> - <topic href="help/EGit/User_Guide/Working-with-remote-Repositories.html#Create_Repository_at_GitHub" label="Create Repository at GitHub"></topic> - <topic href="help/EGit/User_Guide/Working-with-remote-Repositories.html#Eclipse_SSH_Configuration" label="Eclipse SSH Configuration"></topic> - <topic href="help/EGit/User_Guide/Working-with-remote-Repositories.html#Push_Upstream" label="Push Upstream"></topic> + <topic href="help//EGit/User_Guide/Working-with-remote-Repositories.html" label="Working with remote Repositories"> + <topic href="help//EGit/User_Guide/Working-with-remote-Repositories.html#Cloning_Remote_Repositories" label="Cloning Remote Repositories"> + <topic href="help//EGit/User_Guide/Working-with-remote-Repositories.html#Repository_Selection" label="Repository Selection"></topic> + <topic href="help//EGit/User_Guide/Working-with-remote-Repositories.html#Branch_Selection" label="Branch Selection"></topic> + <topic href="help//EGit/User_Guide/Working-with-remote-Repositories.html#Local_Destination" label="Local Destination"></topic> + </topic> + <topic href="help//EGit/User_Guide/Working-with-remote-Repositories.html#Git_References" label="Git References"></topic> + <topic href="help//EGit/User_Guide/Working-with-remote-Repositories.html#Pushing_to_other_Repositories" label="Pushing to other Repositories"> + <topic href="help//EGit/User_Guide/Working-with-remote-Repositories.html#Direct_Push" label="Direct Push"></topic> + <topic href="help//EGit/User_Guide/Working-with-remote-Repositories.html#Push_Wizard" label="Push Wizard"> + <topic href="help//EGit/User_Guide/Working-with-remote-Repositories.html#Push_URI" label="Push URI"></topic> + <topic href="help//EGit/User_Guide/Working-with-remote-Repositories.html#Push_Ref_Specifications" label="Push Ref Specifications"></topic> + <topic href="help//EGit/User_Guide/Working-with-remote-Repositories.html#Delete_Ref_Specifications" label="Delete Ref Specifications"></topic> + <topic href="help//EGit/User_Guide/Working-with-remote-Repositories.html#Conflicting_Push_Ref_Specifications" label="Conflicting Push Ref Specifications"></topic> + <topic href="help//EGit/User_Guide/Working-with-remote-Repositories.html#Push_Confirmation" label="Push Confirmation"></topic> + <topic href="help//EGit/User_Guide/Working-with-remote-Repositories.html#Push_Result_Report" label="Push Result Report"></topic> + </topic> + <topic href="help//EGit/User_Guide/Working-with-remote-Repositories.html#Example:_Pushing_a_Local_Repository_to_GitHub" label="Example: Pushing a Local Repository to GitHub"> + <topic href="help//EGit/User_Guide/Working-with-remote-Repositories.html#Create_Local_Repository" label="Create Local Repository"></topic> + <topic href="help//EGit/User_Guide/Working-with-remote-Repositories.html#Create_Repository_at_GitHub" label="Create Repository at GitHub"></topic> + <topic href="help//EGit/User_Guide/Working-with-remote-Repositories.html#Eclipse_SSH_Configuration" label="Eclipse SSH Configuration"></topic> + <topic href="help//EGit/User_Guide/Working-with-remote-Repositories.html#Push_Upstream" label="Push Upstream"></topic> + </topic> + </topic> + <topic href="help//EGit/User_Guide/Working-with-remote-Repositories.html#Fetching_from_other_Repositories" label="Fetching from other Repositories"> + <topic href="help//EGit/User_Guide/Working-with-remote-Repositories.html#Direct_Fetch" label="Direct Fetch"></topic> + <topic href="help//EGit/User_Guide/Working-with-remote-Repositories.html#Fetch_Wizard" label="Fetch Wizard"> + <topic href="help//EGit/User_Guide/Working-with-remote-Repositories.html#Fetch_Ref_Specifications" label="Fetch Ref Specifications"></topic> + <topic href="help//EGit/User_Guide/Working-with-remote-Repositories.html#Fetch_Result_Report" label="Fetch Result Report"></topic> </topic> </topic> - <topic href="help/EGit/User_Guide/Working-with-remote-Repositories.html#Fetching_from_other_Repositories" label="Fetching from other Repositories"></topic> - <topic href="help/EGit/User_Guide/Working-with-remote-Repositories.html#Pulling_.28merge_or_rebase.29_new_changes_from_Upstream_Repositories" label="Pulling (merge or rebase) new changes from Upstream Repositories"></topic> + <topic href="help//EGit/User_Guide/Working-with-remote-Repositories.html#Pulling_New_Changes_from_Upstream_Repositories" label="Pulling New Changes from Upstream Repositories"></topic> </topic> - <topic href="help/EGit/User_Guide/Inspecting-the-state-of-the-Repository.html" label="Inspecting the state of the Repository"> - <topic href="help/EGit/User_Guide/Inspecting-the-state-of-the-Repository.html#Label_Decorations" label="Label Decorations"></topic> - <topic href="help/EGit/User_Guide/Inspecting-the-state-of-the-Repository.html#History_View" label="History View"> - <topic href="help/EGit/User_Guide/Inspecting-the-state-of-the-Repository.html#History_View_Configuration" label="History View Configuration"></topic> - </topic> - <topic href="help/EGit/User_Guide/Inspecting-the-state-of-the-Repository.html#Commit_Dialog" label="Commit Dialog"></topic> - <topic href="help/EGit/User_Guide/Inspecting-the-state-of-the-Repository.html#Comparing_Content" label="Comparing Content"></topic> - <topic href="help/EGit/User_Guide/Inspecting-the-state-of-the-Repository.html#Quickdiff" label="Quickdiff"></topic> - <topic href="help/EGit/User_Guide/Inspecting-the-state-of-the-Repository.html#View_Diff_for_a_Commit" label="View Diff for a Commit"></topic> + <topic href="help//EGit/User_Guide/Inspecting-the-state-of-the-Repository.html" label="Inspecting the state of the Repository"> + <topic href="help//EGit/User_Guide/Inspecting-the-state-of-the-Repository.html#Label_Decorations" label="Label Decorations"> + <topic href="help//EGit/User_Guide/Inspecting-the-state-of-the-Repository.html#Text_Decorations" label="Text Decorations"></topic> + <topic href="help//EGit/User_Guide/Inspecting-the-state-of-the-Repository.html#Icon_Decorations" label="Icon Decorations"></topic> + </topic> + <topic href="help//EGit/User_Guide/Inspecting-the-state-of-the-Repository.html#History_View_2" label="History View"> + <topic href="help//EGit/User_Guide/Inspecting-the-state-of-the-Repository.html#History_View_Configuration" label="History View Configuration"></topic> + </topic> + <topic href="help//EGit/User_Guide/Inspecting-the-state-of-the-Repository.html#Commit_Dialog" label="Commit Dialog"></topic> + <topic href="help//EGit/User_Guide/Inspecting-the-state-of-the-Repository.html#Comparing_Content" label="Comparing Content"> + <topic href="help//EGit/User_Guide/Inspecting-the-state-of-the-Repository.html#Compare_working_tree_with_last_commit" label="Compare working tree with last commit"></topic> + <topic href="help//EGit/User_Guide/Inspecting-the-state-of-the-Repository.html#Comparing_Working_Tree_with_Index" label="Comparing Working Tree with Index"></topic> + <topic href="help//EGit/User_Guide/Inspecting-the-state-of-the-Repository.html#Comparing_Working_Tree_with_Any_Commit" label="Comparing Working Tree with Any Commit"></topic> + <topic href="help//EGit/User_Guide/Inspecting-the-state-of-the-Repository.html#Comparing_Two_Commits_with_Each_Other" label="Comparing Two Commits with Each Other"></topic> + <topic href="help//EGit/User_Guide/Inspecting-the-state-of-the-Repository.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/Inspecting-the-state-of-the-Repository.html#Quickdiff" label="Quickdiff"></topic> + <topic href="help//EGit/User_Guide/Inspecting-the-state-of-the-Repository.html#View_Diff_for_a_Commit" label="View Diff for a Commit"></topic> </topic> - <topic href="help/EGit/User_Guide/Committing-Changes.html" label="Committing Changes"> - <topic href="help/EGit/User_Guide/Committing-Changes.html#Modifying_the_content" label="Modifying the content"></topic> - <topic href="help/EGit/User_Guide/Committing-Changes.html#Committing" label="Committing"> - <topic href="help/EGit/User_Guide/Committing-Changes.html#Amending_Commits" label="Amending Commits"></topic> - <topic href="help/EGit/User_Guide/Committing-Changes.html#Signing_off_commits" label="Signing off commits"></topic> + <topic href="help//EGit/User_Guide/Committing-Changes.html" label="Committing Changes"> + <topic href="help//EGit/User_Guide/Committing-Changes.html#Modifying_the_content" label="Modifying the content"></topic> + <topic href="help//EGit/User_Guide/Committing-Changes.html#Committing" label="Committing"> + <topic href="help//EGit/User_Guide/Committing-Changes.html#Commit_Message" label="Commit Message"></topic> + <topic href="help//EGit/User_Guide/Committing-Changes.html#Amending_Commits" label="Amending Commits"></topic> + <topic href="help//EGit/User_Guide/Committing-Changes.html#Signing_off_commits" label="Signing off commits"></topic> </topic> </topic> - <topic href="help/EGit/User_Guide/Reverting-Changes.html" label="Reverting Changes"> - <topic href="help/EGit/User_Guide/Reverting-Changes.html#Reverting_changes_in_the_working_tree" label="Reverting changes in the working tree"> - <topic href="help/EGit/User_Guide/Reverting-Changes.html#Replace_with_File_in_Git_Index" label="Replace with File in Git Index"></topic> - <topic href="help/EGit/User_Guide/Reverting-Changes.html#Replace_with_HEAD" label="Replace with HEAD"></topic> + <topic href="help//EGit/User_Guide/Reverting-Changes.html" label="Reverting Changes"> + <topic href="help//EGit/User_Guide/Reverting-Changes.html#Reverting_changes_in_the_working_tree" label="Reverting changes in the working tree"> + <topic href="help//EGit/User_Guide/Reverting-Changes.html#Replace_with_File_in_Git_Index" label="Replace with File in Git Index"></topic> + <topic href="help//EGit/User_Guide/Reverting-Changes.html#Replace_with_HEAD" label="Replace with HEAD"></topic> </topic> - <topic href="help/EGit/User_Guide/Reverting-Changes.html#Resetting_your_current_HEAD" label="Resetting your current HEAD"> - <topic href="help/EGit/User_Guide/Reverting-Changes.html#Reset_to_specific_branch_or_tag" label="Reset to specific branch or tag"></topic> - <topic href="help/EGit/User_Guide/Reverting-Changes.html#Reset_to_a_specific_commit" label="Reset to a specific commit"></topic> - <topic href="help/EGit/User_Guide/Reverting-Changes.html#Revert_all_local_and_staged_changes" label="Revert all local and staged changes"></topic> + <topic href="help//EGit/User_Guide/Reverting-Changes.html#Resetting_your_current_HEAD" label="Resetting your current HEAD"> + <topic href="help//EGit/User_Guide/Reverting-Changes.html#Reset_to_specific_branch_or_tag" label="Reset to specific branch or tag"></topic> + <topic href="help//EGit/User_Guide/Reverting-Changes.html#Reset_to_a_specific_commit" label="Reset to a specific commit"></topic> + <topic href="help//EGit/User_Guide/Reverting-Changes.html#Revert_all_local_and_staged_changes" label="Revert all local and staged changes"></topic> </topic> </topic> - <topic href="help/EGit/User_Guide/Merge.html" label="Merge"> - <topic href="help/EGit/User_Guide/Merge.html#Merging_a_branch_or_a_tag_into_the_current_branch" label="Merging a branch or a tag into the current branch"></topic> + <topic href="help//EGit/User_Guide/Branching.html" label="Branching"> + <topic href="help//EGit/User_Guide/Branching.html#Branching_in_the_Repositories_View" label="Branching in the Repositories View"></topic> + <topic href="help//EGit/User_Guide/Branching.html#Branching_Dialog" label="Branching Dialog"> + <topic href="help//EGit/User_Guide/Branching.html#Creating_a_New_Local_Branch" label="Creating a New Local Branch"></topic> + <topic href="help//EGit/User_Guide/Branching.html#Renaming_an_Existing_Branch" label="Renaming an Existing Branch"></topic> + <topic href="help//EGit/User_Guide/Branching.html#Checking_out_a_Branch" label="Checking out a Branch"></topic> + </topic> + </topic> + <topic href="help//EGit/User_Guide/Merging.html" label="Merging"> + <topic href="help//EGit/User_Guide/Merging.html#Merging_a_branch_or_a_tag_into_the_current_branch" label="Merging a branch or a tag into the current branch"></topic> </topic> - <topic href="help/EGit/User_Guide/Tags.html" label="Tags"> - <topic href="help/EGit/User_Guide/Tags.html#Creating_a_Tag" label="Creating a Tag"></topic> - <topic href="help/EGit/User_Guide/Tags.html#Replacing_an_Existing_Tag" label="Replacing an Existing Tag"></topic> - <topic href="help/EGit/User_Guide/Tags.html#Light-weight_and_Signed_Tags" label="Light-weight and Signed Tags"></topic> + <topic href="help//EGit/User_Guide/Tagging.html" label="Tagging"> + <topic href="help//EGit/User_Guide/Tagging.html#Creating_a_Tag" label="Creating a Tag"></topic> + <topic href="help//EGit/User_Guide/Tagging.html#Replacing_an_Existing_Tag" label="Replacing an Existing Tag"></topic> + <topic href="help//EGit/User_Guide/Tagging.html#Light-weight_and_Signed_Tags" label="Light-weight and Signed Tags"></topic> </topic> - <topic href="help/EGit/User_Guide/Patches.html" label="Patches"> - <topic href="help/EGit/User_Guide/Patches.html#Creating_Patches" label="Creating Patches"> - <topic href="help/EGit/User_Guide/Patches.html#Create_a_Patch_from_a_Commit" label="Create a Patch from a Commit"></topic> - <topic href="help/EGit/User_Guide/Patches.html#Patch_Wizard" label="Patch Wizard"></topic> + <topic href="help//EGit/User_Guide/Patches.html" label="Patches"> + <topic href="help//EGit/User_Guide/Patches.html#Creating_Patches" label="Creating Patches"> + <topic href="help//EGit/User_Guide/Patches.html#Create_a_Patch_from_a_Commit" label="Create a Patch from a Commit"></topic> + <topic href="help//EGit/User_Guide/Patches.html#Patch_Wizard" label="Patch Wizard"></topic> </topic> - <topic href="help/EGit/User_Guide/Patches.html#Applying_Patches" label="Applying Patches"></topic> + <topic href="help//EGit/User_Guide/Patches.html#Applying_Patches" label="Applying Patches"></topic> </topic> - <topic href="help/EGit/User_Guide/Managing-Repositories.html" label="Managing Repositories"> - <topic href="help/EGit/User_Guide/Managing-Repositories.html#Adding_Repositories_to_the_Git_Repositories_View" label="Adding Repositories to the Git Repositories View"> - <topic href="help/EGit/User_Guide/Managing-Repositories.html#Cloning_a_Repository_2" label="Cloning a Repository"></topic> - <topic href="help/EGit/User_Guide/Managing-Repositories.html#Adding_a_Repository_manually" label="Adding a Repository manually"></topic> - <topic href="help/EGit/User_Guide/Managing-Repositories.html#Adding_a_Repository_using_copy_and_paste" label="Adding a Repository using copy and paste"></topic> - </topic> - <topic href="help/EGit/User_Guide/Managing-Repositories.html#Structure_of_the_Git_Repositories_View" label="Structure of the Git Repositories View"></topic> - <topic href="help/EGit/User_Guide/Managing-Repositories.html#Functions_of_the_Git_Repositories_View" label="Functions of the Git Repositories View"> - <topic href="help/EGit/User_Guide/Managing-Repositories.html#Project_Import" label="Project Import"></topic> - <topic href="help/EGit/User_Guide/Managing-Repositories.html#Branch_and_Tag_Support" label="Branch and Tag Support"> - <topic href="help/EGit/User_Guide/Managing-Repositories.html#Check-out_of_Branches_and_Tags" label="Check-out of Branches and Tags"></topic> - <topic href="help/EGit/User_Guide/Managing-Repositories.html#Creation_and_Deletion_of_Branches" label="Creation and Deletion of Branches"></topic> - <topic href="help/EGit/User_Guide/Managing-Repositories.html#Determining_the_Checked-out_Branch" label="Determining the Checked-out Branch"></topic> - <topic href="help/EGit/User_Guide/Managing-Repositories.html#.22Detached.22_HEAD" label=""Detached" HEAD"></topic> + <topic href="help//EGit/User_Guide/Managing-Repositories.html" label="Managing Repositories"> + <topic href="help//EGit/User_Guide/Managing-Repositories.html#Adding_Repositories_to_the_Git_Repositories_View" label="Adding Repositories to the Git Repositories View"> + <topic href="help//EGit/User_Guide/Managing-Repositories.html#Cloning_a_Repository_2" label="Cloning a Repository"></topic> + <topic href="help//EGit/User_Guide/Managing-Repositories.html#Adding_a_Repository_manually" label="Adding a Repository manually"></topic> + <topic href="help//EGit/User_Guide/Managing-Repositories.html#Adding_a_Repository_using_copy_and_paste" label="Adding a Repository using copy and paste"></topic> + </topic> + <topic href="help//EGit/User_Guide/Managing-Repositories.html#Structure_of_the_Git_Repositories_View" label="Structure of the Git Repositories View"></topic> + <topic href="help//EGit/User_Guide/Managing-Repositories.html#Functions_of_the_Git_Repositories_View" label="Functions of the Git Repositories View"> + <topic href="help//EGit/User_Guide/Managing-Repositories.html#Project_Import" label="Project Import"></topic> + <topic href="help//EGit/User_Guide/Managing-Repositories.html#Branch_and_Tag_Support" label="Branch and Tag Support"> + <topic href="help//EGit/User_Guide/Managing-Repositories.html#Check-out_of_Branches_and_Tags" label="Check-out of Branches and Tags"></topic> + <topic href="help//EGit/User_Guide/Managing-Repositories.html#Creation_and_Deletion_of_Branches" label="Creation and Deletion of Branches"></topic> + <topic href="help//EGit/User_Guide/Managing-Repositories.html#Determining_the_Checked-out_Branch" label="Determining the Checked-out Branch"></topic> + <topic href="help//EGit/User_Guide/Managing-Repositories.html#.22Detached.22_HEAD" label=""Detached" HEAD"></topic> </topic> - <topic href="help/EGit/User_Guide/Managing-Repositories.html#Browsing_the_Working_Directory" label="Browsing the Working Directory"></topic> - <topic href="help/EGit/User_Guide/Managing-Repositories.html#Repository_Configuration" label="Repository Configuration"></topic> - <topic href="help/EGit/User_Guide/Managing-Repositories.html#Remote_Repositories" label="Remote Repositories"> - <topic href="help/EGit/User_Guide/Managing-Repositories.html#Direct_Fetch_and_Push_Support" label="Direct Fetch and Push Support"></topic> - <topic href="help/EGit/User_Guide/Managing-Repositories.html#Adding_a_Remote_Configuration" label="Adding a Remote Configuration"></topic> - <topic href="help/EGit/User_Guide/Managing-Repositories.html#Changing_Remote_Configurations" label="Changing Remote Configurations"></topic> + <topic href="help//EGit/User_Guide/Managing-Repositories.html#Browsing_the_Working_Directory" label="Browsing the Working Directory"></topic> + <topic href="help//EGit/User_Guide/Managing-Repositories.html#Repository_Configuration" label="Repository Configuration"></topic> + <topic href="help//EGit/User_Guide/Managing-Repositories.html#Remote_Repositories" label="Remote Repositories"> + <topic href="help//EGit/User_Guide/Managing-Repositories.html#Direct_Fetch_and_Push_Support" label="Direct Fetch and Push Support"></topic> + <topic href="help//EGit/User_Guide/Managing-Repositories.html#Adding_a_Remote_Configuration" label="Adding a Remote Configuration"></topic> + <topic href="help//EGit/User_Guide/Managing-Repositories.html#Changing_Remote_Configurations" label="Changing Remote Configurations"></topic> </topic> </topic> - <topic href="help/EGit/User_Guide/Managing-Repositories.html#Refresh" label="Refresh"></topic> - <topic href="help/EGit/User_Guide/Managing-Repositories.html#Link_with_Selection" label="Link with Selection"></topic> - <topic href="help/EGit/User_Guide/Managing-Repositories.html#Bare_Repositories" label="Bare Repositories"></topic> - <topic href="help/EGit/User_Guide/Managing-Repositories.html#Removing_Repositories_from_the_Git_Repositories_View" label="Removing Repositories from the Git Repositories View"></topic> + <topic href="help//EGit/User_Guide/Managing-Repositories.html#Refresh" label="Refresh"></topic> + <topic href="help//EGit/User_Guide/Managing-Repositories.html#Link_with_Selection" label="Link with Selection"></topic> + <topic href="help//EGit/User_Guide/Managing-Repositories.html#Bare_Repositories" label="Bare Repositories"></topic> + <topic href="help//EGit/User_Guide/Managing-Repositories.html#Removing_Repositories_from_the_Git_Repositories_View" label="Removing Repositories from the Git Repositories View"></topic> </topic> - <topic href="help/EGit/User_Guide/Updating-This-Document.html" label="Updating This Document"></topic> + <topic href="help//EGit/User_Guide/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> - <topic href="help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html#Distributed_Version_Control_Systems" label="Distributed Version Control Systems"></topic> - <topic href="help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html#How_does_it_work.3F" label="How does it work?"></topic> - <topic href="help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html#Changesets_and_branches" label="Changesets and branches"></topic> - <topic href="help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html#Merging" label="Merging"></topic> - <topic href="help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html#Pulling_and_pushing" label="Pulling and pushing"></topic> - <topic href="help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html#Cloning_and_remotes" label="Cloning and remotes"></topic> - <topic href="help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html#Initialising.2C_committing_and_branching" label="Initialising, committing and branching"></topic> - <topic href="help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html#Worked_example" label="Worked example"></topic> - <topic href="help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html#Rebasing_and_fast-forwarding" label="Rebasing and fast-forwarding"></topic> - <topic href="help/EGit/Git_For_Eclipse_Users/Updating-This-Document.html" label="Updating This Document"></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> + <topic href="help//EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html#Distributed_Version_Control_Systems" label="Distributed Version Control Systems"></topic> + <topic href="help//EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html#How_does_it_work.3F" label="How does it work?"></topic> + <topic href="help//EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html#Changesets_and_branches" label="Changesets and branches"></topic> + <topic href="help//EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html#Merging" label="Merging"></topic> + <topic href="help//EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html#Pulling_and_pushing" label="Pulling and pushing"></topic> + <topic href="help//EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html#Cloning_and_remotes" label="Cloning and remotes"></topic> + <topic href="help//EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html#Initialising.2C_committing_and_branching" label="Initialising, committing and branching"></topic> + <topic href="help//EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html#Worked_example" label="Worked example"></topic> + <topic href="help//EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html#Rebasing_and_fast-forwarding" label="Rebasing and fast-forwarding"></topic> + <topic href="help//EGit/Git_For_Eclipse_Users/Updating-This-Document.html" label="Updating This Document"></topic> </topic> -</toc> +</toc>
\ No newline at end of file |
