diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2008-08-10 03:55:58 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2008-08-10 03:55:58 +0000 |
commit | faa1e50737bfc349e8315c99a2ed59182fd557b1 (patch) | |
tree | 05ca5456c6a103f7632321128d3a325a68450748 /git-commit-tree.html | |
parent | b53db3ca58a8a65d8de3b9fa048d410757edc38f (diff) | |
download | git-htmldocs-faa1e50737bfc349e8315c99a2ed59182fd557b1.tar.gz |
Autogenerated HTML docs for v1.6.0-rc2-22-g71b9
Diffstat (limited to 'git-commit-tree.html')
-rw-r--r-- | git-commit-tree.html | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/git-commit-tree.html b/git-commit-tree.html index 1f832dfb7..da3e1fd5d 100644 --- a/git-commit-tree.html +++ b/git-commit-tree.html @@ -327,11 +327,11 @@ git-commit-tree(1) Manual Page <div class="para"><p>This is usually not what an end user wants to run directly. See
<a href="git-commit.html">git-commit(1)</a> instead.</p></div>
<div class="para"><p>Creates a new commit object based on the provided tree object and
-emits the new commit object id on stdout. If no parent is given then
-it is considered to be an initial tree.</p></div>
-<div class="para"><p>A commit object usually has 1 parent (a commit after a change) or up
-to 16 parents. More than one parent represents a merge of branches
-that led to them.</p></div>
+emits the new commit object id on stdout.</p></div>
+<div class="para"><p>A commit object may have any number of parents. With exactly one
+parent, it is an ordinary commit. Having more than one parent makes
+the commit a merge between several lines of history. Initial (root)
+commits have no parents.</p></div>
<div class="para"><p>While a tree represents a particular directory state of a working
directory, a commit represents that state in "time", and explains how
to get there.</p></div>
@@ -525,7 +525,7 @@ reversible operation.</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-07-06 05:16:39 UTC
+Last updated 2008-08-10 03:55:18 UTC
</div>
</div>
</body>
|