diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2008-07-02 03:06:38 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2008-07-02 03:06:38 +0000 |
commit | fce7c7e1549d1a2a2b0faf5952378236eed4d468 (patch) | |
tree | ffce2ae419b52786a0e567f4fddaadd89016f62c /git-commit.html | |
parent | bb8e996adf4293a0b624fe77e95e12ae8d1faed9 (diff) | |
download | git-htmldocs-fce7c7e1549d1a2a2b0faf5952378236eed4d468.tar.gz |
Autogenerated HTML docs for v1.5.6.1-156-ge903b
Diffstat (limited to 'git-commit.html')
-rw-r--r-- | git-commit.html | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/git-commit.html b/git-commit.html index 96224bce7..696c0cbf2 100644 --- a/git-commit.html +++ b/git-commit.html @@ -273,7 +273,7 @@ git-commit(1) Manual Page <h2>SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="content"><em>git-commit</em> [-a | --interactive] [-s] [-v] [-u<mode>] [--amend]
+<div class="content"><em>git commit</em> [-a | --interactive] [-s] [-v] [-u<mode>] [--amend]
[(-c | -C) <commit>] [-F <file> | -m <msg>]
[--allow-empty] [--no-verify] [-e] [--author=<author>]
[--cleanup=<mode>] [--] [[-i | -o ]<file>…]</div></div>
@@ -286,14 +286,14 @@ commit along with a log message describing the changes you have made.</p> <ol>
<li>
<p>
-by using <a href="git-add.html">git-add(1)</a> to incrementally "add" changes to the
+by using <tt>git-add</tt> 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 <a href="git-rm.html">git-rm(1)</a> to remove files from the working tree
+by using <tt>git-rm</tt> to remove files from the working tree
and the index, again before using the <em>commit</em> command;
</p>
</li>
@@ -321,12 +321,12 @@ by using the --interactive switch with the <em>commit</em> command to decide one </p>
</li>
</ol>
-<p>The <a href="git-status.html">git-status(1)</a> command can be used to obtain a
+<p>The <tt>git-status</tt> command can be used to obtain a
summary of what is included by any of the above for the next
commit by giving the same set of parameters you would give to
this command.</p>
-<p>If you make a commit and then found a mistake immediately after
-that, you can recover from it with <a href="git-reset.html">git-reset(1)</a>.</p>
+<p>If you make a commit and then find a mistake immediately after
+that, you can recover from it with <tt>git-reset</tt>.</p>
</div>
<h2>OPTIONS</h2>
<div class="sectionbody">
@@ -436,7 +436,7 @@ that, you can recover from it with <a href="git-reset.html">git-reset(1)</a>.</p <dd>
<p>
This option bypasses the pre-commit and commit-msg hooks.
- See also <a href="githooks.html">githooks(5)</a>[hooks].
+ See also <a href="githooks.html">githooks(5)</a>.
</p>
</dd>
<dt>
@@ -620,9 +620,9 @@ specified.</p> <div class="sectionbody">
<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 <a href="git-add.html">git-add(1)</a>. A file can be
+called the "index" with <tt>git-add</tt>. 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 — <file></tt>,
+to that of the last commit with <tt>git reset HEAD — <file></tt>,
which effectively reverts <tt>git-add</tt> and prevents the changes to
this file from participating in the next commit. After building
the state to be committed incrementally with these commands,
@@ -673,13 +673,13 @@ sequence, if you do:</p> </div></div>
<p>this second commit would record the changes to <tt>hello.c</tt> and
<tt>hello.h</tt> as expected.</p>
-<p>After a merge (initiated by either <a href="git-merge.html">git-merge(1)</a> or
-<a href="git-pull.html">git-pull(1)</a>) stops because of conflicts, cleanly merged
+<p>After a merge (initiated by <tt>git-merge</tt> or <tt>git-pull</tt>) 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 <a href="git-status.html">git-status(1)</a>
+check which paths are conflicting with <tt>git-status</tt>
and after fixing them manually in your working tree, you would
-stage the result as usual with <a href="git-add.html">git-add(1)</a>:</p>
+stage the result as usual with <tt>git-add</tt>:</p>
<div class="listingblock">
<div class="content">
<pre><tt>$ git status | grep unmerged
@@ -791,7 +791,7 @@ order).</p> <h2>HOOKS</h2>
<div class="sectionbody">
<p>This command can run <tt>commit-msg</tt>, <tt>prepare-commit-msg</tt>, <tt>pre-commit</tt>,
-and <tt>post-commit</tt> hooks. See <a href="githooks.html">githooks(5)</a>[hooks] for more
+and <tt>post-commit</tt> hooks. See <a href="githooks.html">githooks(5)</a> for more
information.</p>
</div>
<h2>SEE ALSO</h2>
@@ -813,7 +813,7 @@ Junio C Hamano <junkio@cox.net></p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 23-Jun-2008 07:13:34 UTC
+Last updated 02-Jul-2008 03:01:36 UTC
</div>
</div>
</body>
|