summaryrefslogtreecommitdiffstats
path: root/git-commit.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 /git-commit.html
parenta9701f0184382d8de7380c56558718915905746a (diff)
downloadgit-htmldocs-1aa40d2e3f5186afb805e7020577acb9f5f78b89.tar.gz
Autogenerated HTML docs for v1.6.6.1-383-g5a9f
Diffstat (limited to 'git-commit.html')
-rw-r--r--git-commit.html26
1 files changed, 13 insertions, 13 deletions
diff --git a/git-commit.html b/git-commit.html
index dcebc7dc3..6900b6336 100644
--- a/git-commit.html
+++ b/git-commit.html
@@ -335,14 +335,14 @@ with a log message from the user describing the changes.</p></div>
<div class="olist"><ol>
<li>
<p>
-by using <em>git-add</em> to incrementally "add" changes to the
+by using <em>git add</em> to incrementally "add" changes to the
index before using the <em>commit</em> command (Note: even modified
files must be "added");
</p>
</li>
<li>
<p>
-by using <em>git-rm</em> to remove files from the working tree
+by using <em>git rm</em> to remove files from the working tree
and the index, again before using the <em>commit</em> command;
</p>
</li>
@@ -367,7 +367,7 @@ by using the -a switch with the <em>commit</em> command to automatically
<p>
by using the --interactive switch with the <em>commit</em> command to decide one
by one which files should be part of the commit, before finalizing the
- operation. Currently, this is done by invoking <em>git-add --interactive</em>.
+ operation. Currently, this is done by invoking <em>git add --interactive</em>.
</p>
</li>
</ol></div>
@@ -375,7 +375,7 @@ by using the --interactive switch with the <em>commit</em> command to decide one
summary of what is included by any of the above for the next
commit by giving the same set of parameters (options and paths).</p></div>
<div class="para"><p>If you make a commit and then find a mistake immediately after
-that, you can recover from it with <em>git-reset</em>.</p></div>
+that, you can recover from it with <em>git reset</em>.</p></div>
</div>
<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
@@ -630,7 +630,7 @@ FROM UPSTREAM REBASE" section in <a href="git-rebase.html">git-rebase(1)</a>.)</
Make a commit only from the paths specified on the
command line, disregarding any contents that have been
staged so far. This is the default mode of operation of
- <em>git-commit</em> if any paths are given on the command line,
+ <em>git commit</em> if any paths are given on the command line,
in which case this option can be omitted.
If this option is specified together with <em>--amend</em>, then
no paths need to be specified, which can be used to amend
@@ -800,10 +800,10 @@ ISO 8601
<div class="sectionbody">
<div class="para"><p>When recording your own work, the contents of modified files in
your working tree are temporarily stored to a staging area
-called the "index" with <em>git-add</em>. A file can be
+called the "index" with <em>git add</em>. A file can be
reverted back, only in the index but not in the working tree,
to that of the last commit with <tt>git reset HEAD &#8212; &lt;file&gt;</tt>,
-which effectively reverts <em>git-add</em> and prevents the changes to
+which effectively reverts <em>git add</em> and prevents the changes to
this file from participating in the next commit. After building
the state to be committed incrementally with these commands,
<tt>git commit</tt> (without any pathname parameter) is used to record what
@@ -853,13 +853,13 @@ sequence, if you do:</p></div>
</div></div>
<div class="para"><p>this second commit would record the changes to <tt>hello.c</tt> and
<tt>hello.h</tt> as expected.</p></div>
-<div class="para"><p>After a merge (initiated by <em>git-merge</em> or <em>git-pull</em>) stops
+<div class="para"><p>After a merge (initiated by <em>git merge</em> or <em>git pull</em>) stops
because of conflicts, cleanly merged
paths are already staged to be committed for you, and paths that
conflicted are left in unmerged state. You would have to first
-check which paths are conflicting with <em>git-status</em>
+check which paths are conflicting with <em>git status</em>
and after fixing them manually in your working tree, you would
-stage the result as usual with <em>git-add</em>:</p></div>
+stage the result as usual with <em>git add</em>:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git status | grep unmerged
@@ -923,7 +923,7 @@ mind.</p></div>
<div class="olist"><ol>
<li>
<p>
-<em>git-commit</em> and <em>git-commit-tree</em> issues
+<em>git commit</em> and <em>git commit-tree</em> issues
a warning if the commit log message given to it does not look
like a valid UTF-8 string, unless you explicitly say your
project uses a legacy encoding. The way to say this is to
@@ -941,7 +941,7 @@ implies that the commit log message is encoded in UTF-8.</p></div>
</li>
<li>
<p>
-<em>git-log</em>, <em>git-show</em>, <em>git-blame</em> and friends look at the
+<em>git log</em>, <em>git show</em>, <em>git blame</em> and friends look at the
<tt>encoding</tt> header of a commit object, and try to re-code the
log message into UTF-8 unless otherwise specified. You can
specify the desired output encoding with
@@ -993,7 +993,7 @@ Junio C Hamano &lt;gitster@pobox.com&gt;</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-01-18 01:25:20 UTC
+Last updated 2010-01-21 17:44:23 UTC
</div>
</div>
</body>