diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-12-22 08:27:21 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-12-22 08:27:21 +0000 |
| commit | f1231497f0c07300959a19e2c7b7da9d0e956d53 (patch) | |
| tree | 95ec1b5697c297aecd3727a57482afd30da0da7e /git-revert.html | |
| parent | f62a11d3989648e70e02e297355d8177f29d5dd0 (diff) | |
| download | git-htmldocs-f1231497f0c07300959a19e2c7b7da9d0e956d53.tar.gz | |
Autogenerated HTML docs for v1.6.1-rc4
Diffstat (limited to 'git-revert.html')
| -rw-r--r-- | git-revert.html | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/git-revert.html b/git-revert.html index a05d055f0..c5eed198e 100644 --- a/git-revert.html +++ b/git-revert.html @@ -376,6 +376,12 @@ both will discard uncommitted changes in your working directory.</p></div> the mainline and allows revert to reverse the change
relative to the specified parent.
</p>
+<div class="para"><p>Reverting a merge commit declares that you will never want the tree changes
+brought in by the merge. As a result, later merges will only bring in tree
+changes introduced by commits that are not ancestors of the previously
+reverted merge. This may or may not be what you want.</p></div>
+<div class="para"><p>See the <a href="howto/revert-a-faulty-merge.txt">revert-a-faulty-merge How-To</a> for
+more details.</p></div>
</dd>
<dt>
--no-edit
@@ -433,7 +439,7 @@ effect to your index in a row.</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-12-10 08:33:25 UTC
+Last updated 2008-12-22 08:27:06 UTC
</div>
</div>
</body>
|