diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-11-23 06:11:19 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-11-23 06:11:19 +0000 |
| commit | bf984de67c8dac8e5143a680957a4c5f95d0078f (patch) | |
| tree | 55528481d53d832804b04554a586b505c656e1ef /git-merge.html | |
| parent | 3b70d3c788363466e56886d9fc5d316659cda627 (diff) | |
| download | git-htmldocs-bf984de67c8dac8e5143a680957a4c5f95d0078f.tar.gz | |
Autogenerated HTML docs for v1.6.6-rc0
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/git-merge.html b/git-merge.html index cbfcd6a86..a15d44244 100644 --- a/git-merge.html +++ b/git-merge.html @@ -550,8 +550,9 @@ ours </dt>
<dd>
<p>
- This resolves any number of heads, but the result of the
- merge is always the current branch head. It is meant to
+ This resolves any number of heads, but the resulting tree of the
+ merge is always that of the current branch head, effectively
+ ignoring all changes from all other branches. It is meant to
be used to supersede old development history of side
branches.
</p>
@@ -954,7 +955,7 @@ release/version name would be acceptable.</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-11-16 02:10:12 UTC
+Last updated 2009-11-23 06:10:45 UTC
</div>
</div>
</body>
|