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 966a236 Automated site publishing by Jenkins build 385
966a236 is described below
commit 966a236b9254610014098a97f98f3a89ccd05af3
Author: jenkins <[email protected]>
AuthorDate: Sat Jan 19 10:38:11 2019 +0000
Automated site publishing by Jenkins build 385
---
content/kb/docs/ide/git.html | 216 +++++++++++++------------------------------
1 file changed, 63 insertions(+), 153 deletions(-)
diff --git a/content/kb/docs/ide/git.html b/content/kb/docs/ide/git.html
index 2654559..cdfa52b 100644
--- a/content/kb/docs/ide/git.html
+++ b/content/kb/docs/ide/git.html
@@ -81,43 +81,22 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
<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>
+<li><a href="#_using_git_support_in_netbeans_ide">Using Git Support in
NetBeans IDE</a>
<ul class="sectlevel2">
-<li><a href="#_cloning_a_repository_from_github_via_ssh_protocol">Cloning a
Repository from GitHub via SSH protocol</a></li>
-</ul>
-</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></li>
<li><a href="#_adding_files_to_a_git_repository">Adding Files to a Git
Repository</a></li>
-<li><a href="#_editing_files">Editing Files</a>
-<ul class="sectlevel2">
-<li><a href="#_viewing_changes_in_the_source_editor">Viewing Changes in the
Source Editor</a></li>
-<li><a href="#_viewing_file_status_information">Viewing File Status
Information</a></li>
-<li><a href="#_comparing_file_revisions">Comparing File Revisions</a></li>
-<li><a href="#_reverting_changes">Reverting Changes</a></li>
-</ul>
-</li>
+<li><a href="#_editing_files">Editing Files</a></li>
<li><a href="#_committing_sources_to_a_repository">Committing Sources to a
Repository</a></li>
-<li><a href="#_working_with_branches">Working with Branches</a>
-<ul class="sectlevel2">
-<li><a href="#_creating_a_branch">Creating a Branch</a></li>
-<li><a href="#_checking_out">Checking Out</a></li>
-<li><a href="#_merging">Merging</a></li>
-<li><a href="#_deleting_a_branch">Deleting a Branch</a></li>
-</ul>
-</li>
-<li><a href="#_working_with_remote_repositories">Working with Remote
Repositories</a>
-<ul class="sectlevel2">
-<li><a href="#_fetching">Fetching</a></li>
-<li><a href="#_pulling">Pulling</a></li>
-<li><a href="#_pushing">Pushing</a></li>
+<li><a href="#_working_with_branches">Working with Branches</a></li>
+<li><a href="#_working_with_remote_repositories">Working with Remote
Repositories</a></li>
+<li><a href="#_summary">Summary</a></li>
</ul>
</li>
-<li><a href="#_summary">Summary</a></li>
-<li><a href="#_see_also">See Also</a></li>
</ul>
</div>
-<div id="preamble">
+<div class="sect1">
+<h2 id="_using_git_support_in_netbeans_ide">Using Git Support in NetBeans
IDE</h2>
<div class="sectionbody">
<div class="paragraph">
<p>The NetBeans IDE provides support for the Git version control client. The
IDE’s Git support allows you to perform versioning tasks directly from
your project within the IDE. This document demonstrates how to perform basic
versioning tasks in the IDE by guiding you through the standard workflow when
using versioning software.</p>
@@ -125,41 +104,8 @@
<div class="paragraph">
<p>Git is a free and open source, distributed version control system designed
to handle everything from small to very large projects with speed and
efficiency. Every Git clone is a full-fledged repository with complete history
and full revision tracking capabilities, not dependent on network access or a
central server. Branching and merging are fast and easy to do. Git is used for
version control of files, much like tools such as Mercurial, Subversion, CVS,
Perforce, etc.</p>
</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_requirements">Requirements</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p><strong>To complete this tutorial, you need the following software and
resources.</strong></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">Software or Resource</th>
-<th class="tableblock halign-left valign-top">Version Required</th>
-</tr>
-</thead>
-<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
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
8</p></td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_initializing_a_git_repository">Initializing a Git Repository</h2>
-<div class="sectionbody">
+<div class="sect2">
+<h3 id="_initializing_a_git_repository">Initializing a Git Repository</h3>
<div class="paragraph">
<p>To initialize a Git repository from existing files that are not in source
control yet, you need to complete the following steps:</p>
</div>
@@ -213,10 +159,8 @@ You can open <code>Window</code> >
<code>Output</code> > <code>Output
<p>After you initialized the Git repository, you either <a href="#add">add</a>
files or directly <a href="#committing">commit</a> them to the Git
repository.</p>
</div>
</div>
-</div>
-<div class="sect1">
-<h2 id="_cloning_a_git_repository">Cloning a Git Repository</h2>
-<div class="sectionbody">
+<div class="sect2">
+<h3 id="_cloning_a_git_repository">Cloning a Git Repository</h3>
<div class="paragraph">
<p>To get a copy of an already existing Git repository, you need to clone it.
Make sure you know the Git repository URL before starting the Clone Repository
wizard in the IDE.</p>
</div>
@@ -281,8 +225,8 @@ After a Git repository is cloned, the metadata
<code>.git</code> folder is cre
</li>
</ol>
</div>
-<div class="sect2">
-<h3 id="_cloning_a_repository_from_github_via_ssh_protocol">Cloning a
Repository from GitHub via SSH protocol</h3>
+<div class="sect3">
+<h4 id="_cloning_a_repository_from_github_via_ssh_protocol">Cloning a
Repository from GitHub via SSH protocol</h4>
<div class="paragraph">
<p>To clone a repository from GitHub via the SSH protocol, proceed as
follows:</p>
</div>
@@ -439,14 +383,10 @@ After the repository is cloned, the Clone Completed
message displays.</p>
</div>
</div>
</div>
-</div>
-<div class="sect1">
-<h2 id="_adding_files_to_a_git_repository">Adding Files to a Git
Repository</h2>
-<div class="sectionbody">
-<div class="literalblock">
-<div class="content">
-<pre>To start tracking a new file and also to stage changes to an already
tracked file in the Git repository, you need to add it to the repository.</pre>
-</div>
+<div class="sect2">
+<h3 id="_adding_files_to_a_git_repository">Adding Files to a Git
Repository</h3>
+<div class="paragraph">
+<p>To start tracking a new file and also to stage changes to an already
tracked file in the Git repository, you need to add it to the repository.</p>
</div>
<div class="paragraph">
<p>When adding files to a Git repository, the IDE composes and saves snapshots
of your project first in the Index. After you perform the commit, the IDE saves
those snapshots in the HEAD. The IDE allows you to choose between the two
workflows described in the following table.</p>
@@ -503,10 +443,8 @@ The <a href="#viewFileStatus">status</a> of the file in
the HEAD displays in gre
<p>The action works recursively if invoked on folders while respecting the
NetBeans IDE flat folder content structure.</p>
</div>
</div>
-</div>
-<div class="sect1">
-<h2 id="_editing_files">Editing Files</h2>
-<div class="sectionbody">
+<div class="sect2">
+<h3 id="_editing_files">Editing Files</h3>
<div class="paragraph">
<p>Once you have a Git versioned project opened in the IDE, you can begin
making changes to sources. As with any project opened in NetBeans IDE, you can
open files in the Source Editor by double-clicking on their nodes, as they
appear in the IDE’s windows (e.g., Projects (Ctrl-1), Files (Ctrl-2),
Favorites (Ctrl-3) windows).</p>
</div>
@@ -526,8 +464,8 @@ The <a href="#viewFileStatus">status</a> of the file in the
HEAD displays in gre
</li>
</ul>
</div>
-<div class="sect2">
-<h3 id="_viewing_changes_in_the_source_editor">Viewing Changes in the Source
Editor</h3>
+<div class="sect3">
+<h4 id="_viewing_changes_in_the_source_editor">Viewing Changes in the Source
Editor</h4>
<div class="paragraph">
<p>When you open a versioned file in the IDE’s Source Editor, you can
view real-time changes occurring to your file as you modify it against the base
version from the Git repository. As you work, the IDE uses color coding in the
Source Editor’s margins to convey the following information:</p>
</div>
@@ -595,8 +533,8 @@ You can click on a color grouping in the margin to call
versioning commands. For
</div>
</div>
</div>
-<div class="sect2">
-<h3 id="_viewing_file_status_information">Viewing File Status Information</h3>
+<div class="sect3">
+<h4 id="_viewing_file_status_information">Viewing File Status Information</h4>
<div class="paragraph">
<p>When you are working in the Projects (Ctrl-1), Files (Ctrl-2), Favorites
(Ctrl-3), or Versioning views, the IDE provides several visual features that
aid in viewing status information about your files. In the example below,
notice how the badge (e.g. image::images/blue-badge.png[]), color of the file
name, and adjacent status label, all coincide with each other to provide you
with a simple but effective way to keep track of versioning information on your
files:</p>
</div>
@@ -621,6 +559,7 @@ You can click on a color grouping in the margin to call
versioning commands. For
</li>
</ul>
</div>
+</div>
<div class="sect3">
<h4 id="_badges_and_color_coding">Badges and Color Coding</h4>
<div class="paragraph">
@@ -785,9 +724,8 @@ You can click on a color grouping in the margin to call
versioning commands. For
</div>
</div>
</div>
-</div>
-<div class="sect2">
-<h3 id="_comparing_file_revisions">Comparing File Revisions</h3>
+<div class="sect3">
+<h4 id="_comparing_file_revisions">Comparing File Revisions</h4>
<div class="paragraph">
<p>Comparing file versions is a common task when working with versioned
projects. The IDE enables you to compare revisions by using the Diff
command:</p>
</div>
@@ -932,8 +870,8 @@ Other revisions can be selected from the <code>Diff</code>
and <code>to</code
</tbody>
</table>
</div>
-<div class="sect2">
-<h3 id="_reverting_changes">Reverting Changes</h3>
+<div class="sect3">
+<h4 id="_reverting_changes">Reverting Changes</h4>
<div class="paragraph">
<p>To throw away local changes made to selected files in your Working Tree and
replace those files with the ones in the Index or HEAD:</p>
</div>
@@ -968,10 +906,8 @@ The <code>Revert Modifications</code> dialog box
displays.</p>
</div>
</div>
</div>
-</div>
-<div class="sect1">
-<h2 id="_committing_sources_to_a_repository">Committing Sources to a
Repository</h2>
-<div class="sectionbody">
+<div class="sect2">
+<h3 id="_committing_sources_to_a_repository">Committing Sources to a
Repository</h3>
<div class="paragraph">
<p>To commit files to the Git repository:</p>
</div>
@@ -1064,8 +1000,17 @@ The <code>Revert Modifications</code> dialog box
displays.</p>
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Note</strong>: You need to install the JIRA or Subversion plugin to
start tracking issues in the IDE.</p>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-note" title="Note"></i>
+</td>
+<td class="content">
+You need to install the JIRA or Subversion plugin to start tracking issues in
the IDE.
+</td>
+</tr>
+</table>
</div>
<div class="olist arabic">
<ol class="arabic">
@@ -1089,10 +1034,8 @@ The IDE executes the commit and stores your snapshots to
the repository. The IDE
</ol>
</div>
</div>
-</div>
-<div class="sect1">
-<h2 id="_working_with_branches">Working with Branches</h2>
-<div class="sectionbody">
+<div class="sect2">
+<h3 id="_working_with_branches">Working with Branches</h3>
<div class="paragraph">
<p>The IDE’s Git support enables you to maintain different versions of
an entire code base using branches.</p>
</div>
@@ -1115,8 +1058,8 @@ The IDE executes the commit and stores your snapshots to
the repository. The IDE
</li>
</ul>
</div>
-<div class="sect2">
-<h3 id="_creating_a_branch">Creating a Branch</h3>
+<div class="sect3">
+<h4 id="_creating_a_branch">Creating a Branch</h4>
<div class="paragraph">
<p>To create a local branch, if you want to work on a separate version of your
file system for stabilization or experimentation purposes without disturbing
the main trunk, complete the following steps:</p>
</div>
@@ -1181,8 +1124,8 @@ The branch is added to the <code>Branches/Local</code>
folder of the Git repos
</div>
</div>
</div>
-<div class="sect2">
-<h3 id="_checking_out">Checking Out</h3>
+<div class="sect3">
+<h4 id="_checking_out">Checking Out</h4>
<div class="paragraph">
<p>If you need to edit files on a branch that already exists, you can check
out the branch to copy the files to your Working Tree.</p>
</div>
@@ -1292,8 +1235,8 @@ If selected, the Index is updated with the state in the
selected revision prior
</ol>
</div>
</div>
-<div class="sect2">
-<h3 id="_merging">Merging</h3>
+<div class="sect3">
+<h4 id="_merging">Merging</h4>
<div class="paragraph">
<p>To port modifications from a repository revision to the Working Tree, do
as follows:</p>
</div>
@@ -1353,8 +1296,8 @@ After merging you must still <a
href="#committing">commit</a> the changes in ord
</table>
</div>
</div>
-<div class="sect2">
-<h3 id="_deleting_a_branch">Deleting a Branch</h3>
+<div class="sect3">
+<h4 id="_deleting_a_branch">Deleting a Branch</h4>
<div class="paragraph">
<p>To delete an unnecessary local branch, complete the following steps:</p>
</div>
@@ -1393,10 +1336,8 @@ The branch is removed from the local repository as well
as the Git Repository Br
</div>
</div>
</div>
-</div>
-<div class="sect1">
-<h2 id="_working_with_remote_repositories">Working with Remote
Repositories</h2>
-<div class="sectionbody">
+<div class="sect2">
+<h3 id="_working_with_remote_repositories">Working with Remote
Repositories</h3>
<div class="paragraph">
<p>When you work with other developers you need to share your work, which
involves fetching, pushing, and pulling data to and from remote repositories
hosted on the Internet or network.</p>
</div>
@@ -1413,8 +1354,8 @@ The branch is removed from the local repository as well
as the Git Repository Br
</li>
</ul>
</div>
-<div class="sect2">
-<h3 id="_fetching">Fetching</h3>
+<div class="sect3">
+<h4 id="_fetching">Fetching</h4>
<div class="paragraph">
<p>Fetching gets the changes from the original remote repository that you do
not have yet. It never changes any of your local branches. Fetching gets all
the branches from remote repositories, which you can merge into your branch or
just inspect at any time.</p>
</div>
@@ -1451,8 +1392,8 @@ Next the fetched updates can be merged into a local
branch.</p>
</ol>
</div>
</div>
-<div class="sect2">
-<h3 id="_pulling">Pulling</h3>
+<div class="sect3">
+<h4 id="_pulling">Pulling</h4>
<div class="paragraph">
<p>When pulling some updates from a remote Git repository, the changes are
fetched from it and merged into the current HEAD of your local repository.
To perform pulling, complete the following steps:</p>
@@ -1486,8 +1427,8 @@ Your local repository is synchronized with the origin
repository.</p>
</ol>
</div>
</div>
-<div class="sect2">
-<h3 id="_pushing">Pushing</h3>
+<div class="sect3">
+<h4 id="_pushing">Pushing</h4>
<div class="paragraph">
<p>To contribute changes from your local Git repository into a public Git
repository, perform the following steps:</p>
</div>
@@ -1536,42 +1477,11 @@ The specified remote repository branch is updated with
the latest state of your
</div>
</div>
</div>
-</div>
-<div class="sect1">
-<h2 id="_summary">Summary</h2>
-<div class="sectionbody">
+<div class="sect2">
+<h3 id="_summary">Summary</h3>
<div class="paragraph">
<p>This tutorial showed how to perform basic versioning tasks in the IDE by
guiding you through the standard workflow when using the IDE’s GIT
support. It demonstrated how to set up a versioned project and perform basic
tasks on versioned files while introducing you to some of the GIT specific
features included in the IDE.</p>
</div>
-<div class="paragraph">
-<p><a
href="/about/contact_form.html?to=3&subject=Feedback:%20Using%20Git%20Support%20in%20NetBeans%20IDE">Send
Feedback on This Tutorial</a></p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_see_also">See Also</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>For related material see the following documents:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="clearcase.html">Using ClearCase Support in NetBeans IDE</a></p>
-</li>
-<li>
-<p><a href="subversion.html">Using Subversion Support in NetBeans IDE</a></p>
-</li>
-<li>
-<p><a href="mercurial.html">Using Mercurial Support in NetBeans IDE</a></p>
-</li>
-<li>
-<p><a href="cvs.html">Using CVS Support in NetBeans IDE</a></p>
-</li>
-<li>
-<p><a
href="http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG234";>Versioning
Applications with Version Control</a> in <em>Developing Applications with
NetBeans IDE</em></p>
-</li>
-</ul>
</div>
</div>
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
