summaryrefslogtreecommitdiffstats
path: root/gittutorial.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-01-21 17:46:43 +0000
committerJunio C Hamano <junio@kernel.org>2010-01-21 17:46:43 +0000
commit1aa40d2e3f5186afb805e7020577acb9f5f78b89 (patch)
tree72812d480799e16b94f9cfed423b8d7d45c7fb4f /gittutorial.html
parenta9701f0184382d8de7380c56558718915905746a (diff)
downloadgit-htmldocs-1aa40d2e3f5186afb805e7020577acb9f5f78b89.tar.gz
Autogenerated HTML docs for v1.6.6.1-383-g5a9f
Diffstat (limited to 'gittutorial.html')
-rw-r--r--gittutorial.html44
1 files changed, 22 insertions, 22 deletions
diff --git a/gittutorial.html b/gittutorial.html
index 783b7d6cc..4f3750e53 100644
--- a/gittutorial.html
+++ b/gittutorial.html
@@ -369,14 +369,14 @@ $ git init</tt></pre>
<div class="para"><p>You've now initialized the working directory--you may notice a new
directory created, named ".git".</p></div>
<div class="para"><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>
+current directory (note the <em>.</em>), with <em>git add</em>:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git add .</tt></pre>
</div></div>
<div class="para"><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>
+repository with <em>git commit</em>:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git commit</tt></pre>
@@ -392,14 +392,14 @@ version of your project in git.</p></div>
<pre><tt>$ git add file1 file2 file3</tt></pre>
</div></div>
<div class="para"><p>You are now ready to commit. You can see what is about to be committed
-using <em>git-diff</em> with the --cached option:</p></div>
+using <em>git diff</em> with the --cached option:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git diff --cached</tt></pre>
</div></div>
-<div class="para"><p>(Without --cached, <em>git-diff</em> will show you any changes that
+<div class="para"><p>(Without --cached, <em>git diff</em> will show you any changes that
you've made but not yet added to the index.) You can also get a brief
-summary of the situation with <em>git-status</em>:</p></div>
+summary of the situation with <em>git status</em>:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git status
@@ -420,7 +420,7 @@ newly modified content to the index. Finally, commit your changes with:</p></di
</div></div>
<div class="para"><p>This will again prompt you for a message describing the change, and then
record a new version of the project.</p></div>
-<div class="para"><p>Alternatively, instead of running <em>git-add</em> beforehand, you can use</p></div>
+<div class="para"><p>Alternatively, instead of running <em>git add</em> beforehand, you can use</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git commit -a</tt></pre>
@@ -438,7 +438,7 @@ commit in the body.</p></div>
<div class="sectionbody">
<div class="para"><p>Many revision control systems provide an <tt>add</tt> command that tells the
system to start tracking changes to a new file. Git's <tt>add</tt> command
-does something simpler and more powerful: <em>git-add</em> is used both for new
+does something simpler and more powerful: <em>git add</em> is used both for new
and newly modified files, and in both cases it takes a snapshot of the
given files and stages that content in the index, ready for inclusion in
the next commit.</p></div>
@@ -630,14 +630,14 @@ it easier:</p></div>
<pre><tt>alice$ git remote add bob /home/bob/myrepo</tt></pre>
</div></div>
<div class="para"><p>With this, Alice can perform the first part of the "pull" operation
-alone using the <em>git-fetch</em> command without merging them with her own
+alone using the <em>git fetch</em> command without merging them with her own
branch, using:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>alice$ git fetch bob</tt></pre>
</div></div>
<div class="para"><p>Unlike the longhand form, when Alice fetches from Bob using a
-remote repository shorthand set up with <em>git-remote</em>, what was
+remote repository shorthand set up with <em>git remote</em>, what was
fetched is stored in a remote tracking branch, in this case
<tt>bob/master</tt>. So after this:</p></div>
<div class="listingblock">
@@ -674,7 +674,7 @@ used for pulls:</p></div>
<pre><tt>bob$ git config --get remote.origin.url
/home/alice/project</tt></pre>
</div></div>
-<div class="para"><p>(The complete configuration created by <em>git-clone</em> is visible using
+<div class="para"><p>(The complete configuration created by <em>git clone</em> is visible using
<tt>git config -l</tt>, and the <a href="git-config.html">git-config(1)</a> man page
explains the meaning of each option.)</p></div>
<div class="para"><p>Git also keeps a pristine copy of Alice's master branch under the
@@ -699,7 +699,7 @@ that various users push changes to; see <a href="git-push.html">git-push(1)</a>
<h2 id="_exploring_history">Exploring history</h2>
<div class="sectionbody">
<div class="para"><p>Git history is represented as a series of interrelated commits. We
-have already seen that the <em>git-log</em> command can list those commits.
+have already seen that the <em>git log</em> command can list those commits.
Note that first line of each git log entry also gives a name for the
commit:</p></div>
<div class="listingblock">
@@ -711,7 +711,7 @@ Date: Tue May 16 17:18:22 2006 -0700
merge-base: Clarify the comments on post processing.</tt></pre>
</div></div>
-<div class="para"><p>We can give this name to <em>git-show</em> to see the details about this
+<div class="para"><p>We can give this name to <em>git show</em> to see the details about this
commit.</p></div>
<div class="listingblock">
<div class="content">
@@ -762,19 +762,19 @@ $ git reset --hard HEAD^ # reset your current branch and working
<div class="para"><p>Be careful with that last command: in addition to losing any changes
in the working directory, it will also remove all later commits from
this branch. If this branch is the only branch containing those
-commits, they will be lost. Also, don't use <em>git-reset</em> on a
+commits, they will be lost. Also, don't use <em>git reset</em> on a
publicly-visible branch that other developers pull from, as it will
force needless merges on other developers to clean up the history.
-If you need to undo changes that you have pushed, use <em>git-revert</em>
+If you need to undo changes that you have pushed, use <em>git revert</em>
instead.</p></div>
-<div class="para"><p>The <em>git-grep</em> command can search for strings in any version of your
+<div class="para"><p>The <em>git grep</em> command can search for strings in any version of your
project, so</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git grep "hello" v2.5</tt></pre>
</div></div>
<div class="para"><p>searches for all occurrences of "hello" in v2.5.</p></div>
-<div class="para"><p>If you leave out the commit name, <em>git-grep</em> will search any of the
+<div class="para"><p>If you leave out the commit name, <em>git grep</em> will search any of the
files it manages in your current directory. So</p></div>
<div class="listingblock">
<div class="content">
@@ -782,7 +782,7 @@ files it manages in your current directory. So</p></div>
</div></div>
<div class="para"><p>is a quick way to search just the files that are tracked by git.</p></div>
<div class="para"><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>
+in a number of ways. Here are some examples with <em>git log</em>:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git log v2.5..v2.6 # commits between v2.5 and v2.6
@@ -791,7 +791,7 @@ $ git log --since="2 weeks ago" # commits from the last 2 weeks
$ git log v2.5.. Makefile # commits since v2.5 which modify
# Makefile</tt></pre>
</div></div>
-<div class="para"><p>You can also give <em>git-log</em> a "range" of commits where the first is not
+<div class="para"><p>You can also give <em>git log</em> a "range" of commits where the first is not
necessarily an ancestor of the second; for example, if the tips of
the branches "stable" and "master" diverged from a common
commit some time ago, then</p></div>
@@ -807,9 +807,9 @@ stable branch, while</p></div>
</div></div>
<div class="para"><p>will show the list of commits made on the stable branch but not
the master branch.</p></div>
-<div class="para"><p>The <em>git-log</em> command has a weakness: it must present commits in a
+<div class="para"><p>The <em>git log</em> command has a weakness: it must present commits in a
list. When the history has lines of development that diverged and
-then merged back together, the order in which <em>git-log</em> presents
+then merged back together, the order in which <em>git log</em> presents
those commits is meaningless.</p></div>
<div class="para"><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
@@ -829,7 +829,7 @@ of the file:</p></div>
<div class="content">
<pre><tt>$ git diff v2.5:Makefile HEAD:Makefile.in</tt></pre>
</div></div>
-<div class="para"><p>You can also use <em>git-show</em> to see any such file:</p></div>
+<div class="para"><p>You can also use <em>git show</em> to see any such file:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git show v2.5:Makefile</tt></pre>
@@ -916,7 +916,7 @@ digressions that may be interesting at this point are:</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-12-03 09:12:54 UTC
+Last updated 2010-01-21 17:44:42 UTC
</div>
</div>
</body>