diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-07-24 20:24:57 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-07-24 20:24:57 -0700 |
commit | d7fccbf9c67ab9111bc853a5fc90aa87d2d3f9c0 (patch) | |
tree | c35d99c84c5b6f4e4c14928f9465522b255bfa8c /git-rev-list.html | |
parent | 58f587aef6ee6b6b759fe8f4dd500f471eee1b88 (diff) | |
download | git-htmldocs-d7fccbf9c67ab9111bc853a5fc90aa87d2d3f9c0.tar.gz |
Autogenerated HTML docs for v1.8.4-rc0
Diffstat (limited to 'git-rev-list.html')
-rw-r--r-- | git-rev-list.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rev-list.html b/git-rev-list.html index c40aef683..a3f96f77a 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -1415,7 +1415,7 @@ In <code>A</code>, <code>foo</code> contains just "foo". </li>
<li>
<p>
-<code>X</code> is an indpendent root commit that added a new file <code>side</code>, and <code>Y</code>
+<code>X</code> is an independent root commit that added a new file <code>side</code>, and <code>Y</code>
modified it. <code>Y</code> is TREESAME to <code>X</code>. Its merge <code>Q</code> added <code>side</code> to <code>P</code>, and
<code>Q</code> is TREESAME to <code>P</code>, but not to <code>Y</code>.
</p>
|