diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-02-05 21:13:21 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-02-05 21:13:21 -0800 |
commit | 076ffcc834f02a4f11d7f4fe8825be3b065020ff (patch) | |
tree | 6f5fa28df80c60c9b0a1dfab028d3db33ae22fa0 /gittutorial.html | |
parent | 3f2ed6f9b744f05cf2ad32b0c0c80aa149d9fdcb (diff) | |
download | git-htmldocs-076ffcc834f02a4f11d7f4fe8825be3b065020ff.tar.gz |
Autogenerated HTML docs for v1.8.1.2-545-g2f19ad
Diffstat (limited to 'gittutorial.html')
-rw-r--r-- | gittutorial.html | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/gittutorial.html b/gittutorial.html index 2d55f4539..2ba2d7f68 100644 --- a/gittutorial.html +++ b/gittutorial.html @@ -737,7 +737,7 @@ gittutorial(7) Manual Page <h2>NAME</h2>
<div class="sectionbody">
<p>gittutorial -
- A tutorial introduction to git (for version 1.5.1 or newer)
+ A tutorial introduction to Git (for version 1.5.1 or newer)
</p>
</div>
</div>
@@ -754,9 +754,9 @@ gittutorial(7) Manual Page <div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>This tutorial explains how to import a new project into git, make
+<div class="paragraph"><p>This tutorial explains how to import a new project into Git, make
changes to it, and share changes with other developers.</p></div>
-<div class="paragraph"><p>If you are instead primarily interested in using git to fetch a project,
+<div class="paragraph"><p>If you are instead primarily interested in using Git to fetch a project,
for example, to test the latest version, you may prefer to start with
the first two chapters of <a href="user-manual.html">The Git User’s Manual</a>.</p></div>
<div class="paragraph"><p>First, note that you can get documentation for a command such as
@@ -772,7 +772,7 @@ the first two chapters of <a href="user-manual.html">The Git User’s Manual </div></div>
<div class="paragraph"><p>With the latter, you can use the manual viewer of your choice; see
<a href="git-help.html">git-help(1)</a> for more information.</p></div>
-<div class="paragraph"><p>It is a good idea to introduce yourself to git with your name and
+<div class="paragraph"><p>It is a good idea to introduce yourself to Git with your name and
public email address before doing any operation. The easiest
way to do so is:</p></div>
<div class="listingblock">
@@ -786,7 +786,7 @@ $ git config --global user.email you@yourdomain.example.com</code></pre> <h2 id="_importing_a_new_project">Importing a new project</h2>
<div class="sectionbody">
<div class="paragraph"><p>Assume you have a tarball project.tar.gz with your initial work. You
-can place it under git revision control as follows.</p></div>
+can place it under Git revision control as follows.</p></div>
<div class="listingblock">
<div class="content">
<pre><code>$ tar xzf project.tar.gz
@@ -800,13 +800,13 @@ $ git init</code></pre> </div></div>
<div class="paragraph"><p>You’ve now initialized the working directory—you may notice a new
directory created, named ".git".</p></div>
-<div class="paragraph"><p>Next, tell git to take a snapshot of the contents of all files under the
+<div class="paragraph"><p>Next, tell Git to take a snapshot of the contents of all files under the
current directory (note the <em>.</em>), with <em>git add</em>:</p></div>
<div class="listingblock">
<div class="content">
<pre><code>$ git add .</code></pre>
</div></div>
-<div class="paragraph"><p>This snapshot is now stored in a temporary staging area which git calls
+<div class="paragraph"><p>This snapshot is now stored in a temporary staging area which Git calls
the "index". You can permanently store the contents of the index in the
repository with <em>git commit</em>:</p></div>
<div class="listingblock">
@@ -814,7 +814,7 @@ repository with <em>git commit</em>:</p></div> <pre><code>$ git commit</code></pre>
</div></div>
<div class="paragraph"><p>This will prompt you for a commit message. You’ve now stored the first
-version of your project in git.</p></div>
+version of your project in Git.</p></div>
</div>
</div>
<div class="sect1">
@@ -866,7 +866,7 @@ begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more
thorough description. The text up to the first blank line in a commit
message is treated as the commit title, and that title is used
-throughout git. For example, <a href="git-format-patch.html">git-format-patch(1)</a> turns a
+throughout Git. For example, <a href="git-format-patch.html">git-format-patch(1)</a> turns a
commit into email, and it uses the title on the Subject line and the
rest of the commit in the body.</p></div>
</div>
@@ -906,7 +906,7 @@ each step</p></div> <div class="sect1">
<h2 id="_managing_branches">Managing branches</h2>
<div class="sectionbody">
-<div class="paragraph"><p>A single git repository can maintain multiple branches of
+<div class="paragraph"><p>A single Git repository can maintain multiple branches of
development. To create a new branch named "experimental", use</p></div>
<div class="listingblock">
<div class="content">
@@ -989,9 +989,9 @@ out.</p></div> </div>
</div>
<div class="sect1">
-<h2 id="_using_git_for_collaboration">Using git for collaboration</h2>
+<h2 id="_using_git_for_collaboration">Using Git for collaboration</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Suppose that Alice has started a new project with a git repository in
+<div class="paragraph"><p>Suppose that Alice has started a new project with a Git repository in
/home/alice/project, and that Bob, who has a home directory on the
same machine, wants to contribute.</p></div>
<div class="paragraph"><p>Bob begins with:</p></div>
@@ -1025,7 +1025,7 @@ from a remote branch, then merges them into the current branch.</p></div> initiating this "pull". If Bob’s work conflicts with what Alice did since
their histories forked, Alice will use her working tree and the index to
resolve conflicts, and existing local changes will interfere with the
-conflict resolution process (git will still perform the fetch but will
+conflict resolution process (Git will still perform the fetch but will
refuse to merge --- Alice will have to get rid of her local changes in
some way and pull again when this happens).</p></div>
<div class="paragraph"><p>Alice can peek at what Bob did without merging first, using the "fetch"
@@ -1110,7 +1110,7 @@ regardless of what else is given on the command line.</p></div> <pre><code>bob$ git pull</code></pre>
</div></div>
<div class="paragraph"><p>Note that he doesn’t need to give the path to Alice’s repository;
-when Bob cloned Alice’s repository, git stored the location of her
+when Bob cloned Alice’s repository, Git stored the location of her
repository in the repository configuration, and that location is
used for pulls:</p></div>
<div class="listingblock">
@@ -1134,7 +1134,7 @@ perform clones and pulls using the ssh protocol:</p></div> <div class="content">
<pre><code>bob$ git clone alice.org:/home/alice/project myrepo</code></pre>
</div></div>
-<div class="paragraph"><p>Alternatively, git has a native protocol, or can use rsync or http;
+<div class="paragraph"><p>Alternatively, Git has a native protocol, or can use rsync or http;
see <a href="git-pull.html">git-pull(1)</a> for details.</p></div>
<div class="paragraph"><p>Git can also be used in a CVS-like mode, with a central repository
that various users push changes to; see <a href="git-push.html">git-push(1)</a> and
@@ -1195,7 +1195,7 @@ $ git show HEAD^2 # show the second parent of HEAD</code></pre> share this name with other people (for example, to identify a release
version), you should create a "tag" object, and perhaps sign it; see
<a href="git-tag.html">git-tag(1)</a> for details.</p></div>
-<div class="paragraph"><p>Any git command that needs to know a commit can take any of these
+<div class="paragraph"><p>Any Git command that needs to know a commit can take any of these
names. For example:</p></div>
<div class="listingblock">
<div class="content">
@@ -1226,8 +1226,8 @@ files it manages in your current directory. So</p></div> <div class="content">
<pre><code>$ git grep "hello"</code></pre>
</div></div>
-<div class="paragraph"><p>is a quick way to search just the files that are tracked by git.</p></div>
-<div class="paragraph"><p>Many git commands also take sets of commits, which can be specified
+<div class="paragraph"><p>is a quick way to search just the files that are tracked by Git.</p></div>
+<div class="paragraph"><p>Many Git commands also take sets of commits, which can be specified
in a number of ways. Here are some examples with <em>git log</em>:</p></div>
<div class="listingblock">
<div class="content">
@@ -1258,7 +1258,7 @@ list. When the history has lines of development that diverged and then merged back together, the order in which <em>git log</em> presents
those commits is meaningless.</p></div>
<div class="paragraph"><p>Most projects with multiple contributors (such as the Linux kernel,
-or git itself) have frequent merges, and <em>gitk</em> does a better job of
+or Git itself) have frequent merges, and <em>gitk</em> does a better job of
visualizing their history. For example,</p></div>
<div class="listingblock">
<div class="content">
@@ -1287,7 +1287,7 @@ of the file:</p></div> <div class="sectionbody">
<div class="paragraph"><p>This tutorial should be enough to perform basic distributed revision
control for your projects. However, to fully understand the depth
-and power of git you need to understand two simple ideas on which it
+and power of Git you need to understand two simple ideas on which it
is based:</p></div>
<div class="ulist"><ul>
<li>
@@ -1307,7 +1307,7 @@ The index file is a cache of the state of a directory tree, </ul></div>
<div class="paragraph"><p>Part two of this tutorial explains the object
database, the index file, and a few other odds and ends that you’ll
-need to make the most of git. You can find it at <a href="gittutorial-2.html">gittutorial-2(7)</a>.</p></div>
+need to make the most of Git. You can find it at <a href="gittutorial-2.html">gittutorial-2(7)</a>.</p></div>
<div class="paragraph"><p>If you don’t want to continue with that right away, a few other
digressions that may be interesting at this point are:</p></div>
<div class="ulist"><ul>
@@ -1337,7 +1337,7 @@ digressions that may be interesting at this point are:</p></div> </li>
<li>
<p>
-<a href="everyday.html">Everyday GIT with 20 Commands Or So</a>
+<a href="everyday.html">Everyday Git with 20 Commands Or So</a>
</p>
</li>
<li>
@@ -1357,7 +1357,7 @@ digressions that may be interesting at this point are:</p></div> <a href="gitglossary.html">gitglossary(7)</a>,
<a href="git-help.html">git-help(1)</a>,
<a href="gitworkflows.html">gitworkflows(7)</a>,
-<a href="everyday.html">Everyday git</a>,
+<a href="everyday.html">Everyday Git</a>,
<a href="user-manual.html">The Git User’s Manual</a></p></div>
</div>
</div>
@@ -1371,7 +1371,7 @@ digressions that may be interesting at this point are:</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-09-17 16:55:59 PDT
+Last updated 2013-02-05 21:07:26 PST
</div>
</div>
</body>
|