This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-netbeans-website.git
The following commit(s) were added to refs/heads/asf-site by this push: new 454f229 Automated site publishing by Jenkins build 188 454f229 is described below commit 454f2296b2fa803accafc7d83f24dec62ba4b729 Author: jenkins <bui...@apache.org> AuthorDate: Mon Jan 7 23:28:10 2019 +0000 Automated site publishing by Jenkins build 188 --- content/kb/docs/ide/git.html | 216 +++++++------------------------------------ 1 file changed, 33 insertions(+), 183 deletions(-) diff --git a/content/kb/docs/ide/git.html b/content/kb/docs/ide/git.html index f74810b..ad3b6a3 100644 --- a/content/kb/docs/ide/git.html +++ b/content/kb/docs/ide/git.html @@ -80,8 +80,7 @@ <div class='grid-container main-content'> <div id="toc" class="toc"> <div id="toctitle"></div> -<ul class="sectlevel2"> -<li><a href="#_contents">Contents</a></li> +<ul class="sectlevel1"> <li><a href="#_requirements">Requirements</a></li> <li><a href="#_initializing_a_git_repository">Initializing a Git Repository</a></li> <li><a href="#_cloning_a_git_repository">Cloning a Git Repository</a> @@ -128,82 +127,6 @@ </div> </div> </div> -<div class="sect2"> -<h3 id="_contents">Contents</h3> -<div class="imageblock"> -<div class="content"> -<img src="images/netbeans-stamp-80-74.png" alt="netbeans stamp 80 74"> -</div> -<div class="title">Figure 1. Content on this page applies to the NetBeans IDE 7.4 and 8.0</div> -</div> -<div class="ulist"> -<ul> -<li> -<p><a href="#initialize">Initializing a Git Repository</a></p> -</li> -<li> -<p><a href="#clone">Cloning a Git Repository</a></p> -</li> -<li> -<p><a href="#github">Cloning a Repository from GitHub via SSH Protocol</a></p> -</li> -<li> -<p><a href="#add">Adding Files to a Git Repository</a></p> -</li> -<li> -<p><a href="#editing">Editing Files</a></p> -</li> -<li> -<p><a href="#viewChanges">Viewing Changes in the Source Editor</a></p> -</li> -<li> -<p><a href="#viewFileStatus">Viewing File Status Information</a></p> -</li> -<li> -<p><a href="#diff">Comparing File Revisions</a></p> -</li> -<li> -<p><a href="#revert">Reverting Changes</a></p> -</li> -<li> -<p><a href="#committing">Committing Sources to a Repository</a></p> -</li> -<li> -<p><a href="#branch">Working with Branches</a></p> -</li> -<li> -<p><a href="#branchCreate">Creating a Branch</a></p> -</li> -<li> -<p><a href="#branchCheckOut">Checking Out a Branch</a></p> -</li> -<li> -<p><a href="#branchMerge">Merging</a></p> -</li> -<li> -<p><a href="#branchDelete">Deleting a Branch</a></p> -</li> -<li> -<p><a href="#remote">Working with Remote Repositories</a></p> -</li> -<li> -<p><a href="#fetch">Fetching</a></p> -</li> -<li> -<p><a href="#pull">Pulling</a></p> -</li> -<li> -<p><a href="#push">Pushing</a></p> -</li> -<li> -<p><a href="#summary">Summary</a></p> -</li> -<li> -<p><a href="#seealso">See Also</a></p> -</li> -</ul> -</div> -</div> <div class="sect1"> <h2 id="_requirements">Requirements</h2> <div class="sectionbody"> @@ -224,11 +147,11 @@ <tbody> <tr> <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://netbeans.org/downloads/index.html">NetBeans IDE</a></p></td> -<td class="tableblock halign-left valign-top"><p class="tableblock">Version 7.4 or 8.0</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock">Version 10.0</p></td> </tr> <tr> <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://www.oracle.com/technetwork/java/javase/downloads/index.html">Java Development Kit</a> (JDK)</p></td> -<td class="tableblock halign-left valign-top"><p class="tableblock">Version 7 or 8</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock">Version 8</p></td> </tr> </tbody> </table> @@ -372,7 +295,7 @@ After a Git repository is cloned, the metadata <code>.git</code> folder is cre <p>Choose <code>Team</code> > <code>Git</code> > <code>Clone</code> from the main menu. The Clone Repository wizard displays.</p> </li> <li> -<p>At the Remote Repository page of the Clone Repository wizard, specify the path to the repository required in the Repository URL field, for example, <code>g...@github.com:tstupka/koliba.git</code> .</p> +<p>At the Remote Repository page of the Clone Repository wizard, specify the path to the repository required in the Repository URL field, for example, <code>g...@github.com:apache/incubator-netbeans.git</code> .</p> </li> <li> <p>Verify <code>git</code> is specified in the Username text field.</p> @@ -683,11 +606,13 @@ This displays the list of files that are not staged. </thead> <tbody> <tr> -<td class="tableblock halign-left valign-top"><p class="tableblock"><strong>Blue Badge</strong> (image::images/blue-badge.png[])</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock"><strong>Blue Badge</strong> +<span class="image"><img src="images/blue-badge.png" alt="blue badge"></span></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Indicates the presence of files that have been modified, added or deleted in your working tree. For packages, this badge applies only to the package itself and not its subpackages. For projects or folders, the badge indicates changes within that item, or any of the contained subfolders.</p></td> </tr> <tr> -<td class="tableblock halign-left valign-top"><p class="tableblock"><strong>Red Badge</strong> (image::images/red-badge.png[])</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock"><strong>Red Badge</strong> +<span class="image"><img src="images/red-badge.png" alt="red badge"></span></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Marks projects, folders or packages that contain <em>conflicting</em> files. For packages, this badge applies only to the package itself and not its subpackages. For projects or folders, the badge indicates conflicts within that item, or any of the contained subfolders.</p></td> </tr> </tbody> @@ -711,108 +636,33 @@ This displays the list of files that are not staged. <tbody> <tr> <td class="tableblock halign-left valign-top"><p class="tableblock"><strong>No specific color (black)</strong></p></td> -<td class="tableblock halign-left valign-top"><p class="tableblock">image::images/black-text.png[]</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/black-text.png" alt="black text"></span></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Indicates that the file has no changes.</p></td> </tr> <tr> <td class="tableblock halign-left valign-top"><p class="tableblock"><strong>Blue</strong></p></td> -<td class="tableblock halign-left valign-top"><p class="tableblock">image::images/blue-text.png[]</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/blue-text.png" alt="blue text"></span></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Indicates that the file has been locally modified.</p></td> </tr> <tr> <td class="tableblock halign-left valign-top"><p class="tableblock"><strong>Green</strong></p></td> -<td class="tableblock halign-left valign-top"><p class="tableblock">image::images/green-text.png[]</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/green-text.png" alt="green text"></span></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Indicates that the file has been locally added.</p></td> </tr> <tr> <td class="tableblock halign-left valign-top"><p class="tableblock"><strong>Red</strong></p></td> -<td class="tableblock halign-left valign-top"><p class="tableblock">image::images/red-text.png[]</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/red-text.png" alt="red text"></span></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Indicates that the file is in a merge conflict.</p></td> </tr> <tr> <td class="tableblock halign-left valign-top"><p class="tableblock"><strong>Gray</strong></p></td> -<td class="tableblock halign-left valign-top"><p class="tableblock">image::images/gray-text.png[]</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/gray-text.png" alt="gray text"></span></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Indicates that the file is ignored by Git and will not be included in versioning commands (e.g. Update and Commit). Files cannot be ignored if they are versioned.</p></td> </tr> </tbody> </table> </div> <div class="sect3"> -<h4 id="_file_status_labels">File Status Labels</h4> -<div class="paragraph"> -<p>The IDE displays two status values for a file:</p> -</div> -<div class="ulist"> -<ul> -<li> -<p>A status describing differences between the files Working Tree and Index state,</p> -</li> -<li> -<p>A status describing differences between the files Index state and current HEAD commit.</p> -</li> -</ul> -</div> -<div class="paragraph"> -<p>File status labels provide a textual indication of the status of versioned files in the IDE’s windows:</p> -</div> -<table class="tableblock frame-all grid-all spread"> -<colgroup> -<col style="width: 50%;"> -<col style="width: 50%;"> -</colgroup> -<thead> -<tr> -<th class="tableblock halign-left valign-top">Status Label</th> -<th class="tableblock halign-left valign-top">Meaning</th> -</tr> -</thead> -<tbody> -<tr> -<td class="tableblock halign-left valign-top"><p class="tableblock"><strong>-</strong></p></td> -<td class="tableblock halign-left valign-top"><p class="tableblock">Unmodified</p></td> -</tr> -<tr> -<td class="tableblock halign-left valign-top"><p class="tableblock"><strong>A</strong></p></td> -<td class="tableblock halign-left valign-top"><p class="tableblock">Added</p></td> -</tr> -<tr> -<td class="tableblock halign-left valign-top"><p class="tableblock"><strong>U</strong></p></td> -<td class="tableblock halign-left valign-top"><p class="tableblock">Updated but unmerged</p></td> -</tr> -<tr> -<td class="tableblock halign-left valign-top"><p class="tableblock"><strong>M</strong></p></td> -<td class="tableblock halign-left valign-top"><p class="tableblock">Modified</p></td> -</tr> -<tr> -<td class="tableblock halign-left valign-top"><p class="tableblock"><strong>D</strong></p></td> -<td class="tableblock halign-left valign-top"><p class="tableblock">Deleted</p></td> -</tr> -<tr> -<td class="tableblock halign-left valign-top"><p class="tableblock"><strong>I</strong></p></td> -<td class="tableblock halign-left valign-top"><p class="tableblock">Ignored</p></td> -</tr> -<tr> -<td class="tableblock halign-left valign-top"><p class="tableblock"><strong>R</strong></p></td> -<td class="tableblock halign-left valign-top"><p class="tableblock">Renamed</p></td> -</tr> -</tbody> -</table> -<div class="paragraph"> -<p>By default, the IDE displays status (new, modified, ignored, etc.) and folder information in gray text to the right of files, as they are listed in windows.</p> -</div> -<div class="imageblock"> -<div class="content"> -<img src="images/file-labels.png" alt="file labels"> -</div> -</div> -<div class="paragraph"> -<p>File(s) in merge conflict feature the unmerged status that is generally annotated by red color until the file(s) is not resolved by your explicit action. The status label for unmerged file(s) depends on the scenario (e.g., <code>A/A</code> - unmerged, both added).</p> -</div> -<div class="paragraph"> -<p>File status labels can be toggled on and off by choosing <code>View</code> > <code>Show Versioning Labels</code> from the main menu.</p> -</div> -</div> -<div class="sect3"> <h4 id="_git_versioning_view">Git Versioning View</h4> <div class="paragraph"> <p>The Git Versioning view provides you with a real-time list of all of the changes made to files within a selected folder of your local working tree. It opens by default in the bottom panel of the IDE, listing added, deleted or modified files.</p> @@ -850,37 +700,37 @@ This displays the list of files that are not staged. </thead> <tbody> <tr> -<td class="tableblock halign-left valign-top"><p class="tableblock">image::images/changes-head-wt.png[]</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/changes-head-wt.png" alt="changes head wt"></span></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock"><strong>Changes between HEAD and Working Tree</strong></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Displays a list of files that are either already staged or only modified/created and not staged yet.</p></td> </tr> <tr> -<td class="tableblock halign-left valign-top"><p class="tableblock">image::images/changes-head-index.png[]</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/changes-head-index.png" alt="changes head index"></span></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock"><strong>Changes between HEAD and Index</strong></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Displays a list of files that are staged.</p></td> </tr> <tr> -<td class="tableblock halign-left valign-top"><p class="tableblock">image::images/changes-index-wt.png[]</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/changes-index-wt.png" alt="changes index wt"></span></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock"><strong>Changes between Index and Working Tree</strong></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Displays files that have differences between their staged and Working Tree states.</p></td> </tr> <tr> -<td class="tableblock halign-left valign-top"><p class="tableblock">image::images/refresh.png[]</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/refresh.png" alt="refresh"></span></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock"><strong>Refresh Statuses</strong></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Refreshes the status of the selected files and folders. Files displayed in the Versioning view can be refreshed to reflect any changes that may have been made externally.</p></td> </tr> <tr> -<td class="tableblock halign-left valign-top"><p class="tableblock">image::images/open-diff.png[]</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/open-diff.png" alt="open diff"></span></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock"><strong>Open Diff</strong></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Opens the Diff Viewer providing you with a side-by-side comparison of your local copies and the versions maintained in the repository.</p></td> </tr> <tr> -<td class="tableblock halign-left valign-top"><p class="tableblock">image::images/update.png[]</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/update.png" alt="update"></span></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock"><strong>Revert Modifications</strong></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Displays the <a href="#revertdialog">Revert Modifications</a> dialog box.</p></td> </tr> <tr> -<td class="tableblock halign-left valign-top"><p class="tableblock">image::images/commit-button.png[]</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/commit-button.png" alt="commit button"></span></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock"><strong>Commit Changes</strong></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Displays the <a href="#commitdialog">Commit</a> dialog box.</p></td> </tr> @@ -952,42 +802,42 @@ A graphical Diff Viewer opens for the selected file(s) and revisions in the IDE& </thead> <tbody> <tr> -<td class="tableblock halign-left valign-top"><p class="tableblock">image::images/changes-head-wt.png[]</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/changes-head-wt.png" alt="changes head wt"></span></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock"><strong>Changes between HEAD and Working Tree</strong></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Displays a list of files that are either already staged or only modified/created and not staged yet.</p></td> </tr> <tr> -<td class="tableblock halign-left valign-top"><p class="tableblock">image::images/changes-head-index.png[]</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/changes-head-index.png" alt="changes head index"></span></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock"><strong>Changes between HEAD and Index</strong></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Displays a list of files that are staged.</p></td> </tr> <tr> -<td class="tableblock halign-left valign-top"><p class="tableblock">image::images/changes-index-wt.png[]</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/changes-index-wt.png" alt="changes index wt"></span></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock"><strong>Changes between Index and Working Tree</strong></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Displays files that have differences between their staged and working tree states.</p></td> </tr> <tr> -<td class="tableblock halign-left valign-top"><p class="tableblock">image::images/nextdiff.png[]</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/nextdiff.png" alt="nextdiff"></span></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock"><strong>Go to Next Difference</strong></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Displays next difference in the file.</p></td> </tr> <tr> -<td class="tableblock halign-left valign-top"><p class="tableblock">image::images/prevdiff.png[]</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/prevdiff.png" alt="prevdiff"></span></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock"><strong>Go to Previous Difference</strong></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Displays previous difference in the file.</p></td> </tr> <tr> -<td class="tableblock halign-left valign-top"><p class="tableblock">image::images/refresh.png[]</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/refresh.png" alt="refresh"></span></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock"><strong>Refresh Statuses</strong></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Refreshes the status of the selected files and folders. Files displayed in the Versioning window can be refreshed to reflect any changes that may have been made externally.</p></td> </tr> <tr> -<td class="tableblock halign-left valign-top"><p class="tableblock">image::images/update.png[]</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/update.png" alt="update"></span></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock"><strong>Revert Modifications</strong></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Displays the <a href="#revertdialog">Revert Modifications</a> dialog box.</p></td> </tr> <tr> -<td class="tableblock halign-left valign-top"><p class="tableblock">image::images/commit-button.png[]</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/commit-button.png" alt="commit button"></span></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock"><strong>Commit Changes</strong></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Displays the <a href="#commitdialog">Commit</a> dialog box.</p></td> </tr> @@ -1011,17 +861,17 @@ A graphical Diff Viewer opens for the selected file(s) and revisions in the IDE& </thead> <tbody> <tr> -<td class="tableblock halign-left valign-top"><p class="tableblock">image::images/insert.png[]</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/insert.png" alt="insert"></span></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock"><strong>Replace</strong></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Inserts the highlighted text into your Working Tree copy.</p></td> </tr> <tr> -<td class="tableblock halign-left valign-top"><p class="tableblock">image::images/arrow.png[]</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/arrow.png" alt="arrow"></span></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock"><strong>Move All</strong></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Reverts the whole local Working Tree copy.</p></td> </tr> <tr> -<td class="tableblock halign-left valign-top"><p class="tableblock">image::images/remove.png[]</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/remove.png" alt="remove"></span></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock"><strong>Remove</strong></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Removes the highlighted text from the local Working Tree copy.</p></td> </tr> @@ -1139,12 +989,12 @@ The <code>Revert Modifications</code> dialog box displays.</p> </thead> <tbody> <tr> -<td class="tableblock halign-left valign-top"><p class="tableblock">image::images/changes-head-index.png[]</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/changes-head-index.png" alt="changes head index"></span></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock"><strong>Changes between HEAD and Index</strong></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Displays a list of files that are staged.</p></td> </tr> <tr> -<td class="tableblock halign-left valign-top"><p class="tableblock">image::images/changes-head-wt.png[]</p></td> +<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/changes-head-wt.png" alt="changes head wt"></span></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock"><strong>Changes between HEAD and Working Tree</strong></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Displays a list of files that are either already staged or only modified/created and not staged yet.</p></td> </tr> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists