X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-revert.txt;h=5e1175800a11d9e6a63102063af782757464d72e;hb=3bd1bb327eb4d3e386800897734f9f42b48280ff;hp=caa07298a6b6c0ea2fe2257cb2c62fcae2e62d46;hpb=16cccd8bff6c0cf2700b169215a831ac63d6b145;p=git.git

diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt
index caa07298a..5e1175800 100644
--- a/Documentation/git-revert.txt
+++ b/Documentation/git-revert.txt
@@ -44,6 +44,14 @@ OPTIONS
 	option specifies the parent number (starting from 1) of
 	the mainline and allows revert to reverse the change
 	relative to the specified parent.
++
+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.
++
+See the link:howto/revert-a-faulty-merge.txt[revert-a-faulty-merge How-To] for
+more details.
 
 --no-edit::
 	With this option, 'git-revert' will not start the commit