git-revert documentation: refer to new HOWTO on reverting faulty merges
Signed-off-by: Boyd Stephen Smith Jr <bss@iguanasuicide.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Boyd Stephen Smith Jr committed
Dec 21, 2008 at 18:26 UTC
b80b5d67999dfa5bb1e7ad8ff50142bb371b3746
1 file changed
+8
Documentation/git-revert.txt
+8
@@ -44,6 +44,14 @@ OPTIONS
44
option specifies the parent number (starting from 1) of
45
the mainline and allows revert to reverse the change
46
relative to the specified parent.
47
++
48
+Reverting a merge commit declares that you will never want the tree changes
49
+brought in by the merge. As a result, later merges will only bring in tree
50
+changes introduced by commits that are not ancestors of the previously
51
+reverted merge. This may or may not be what you want.
52
++
53
+See the link:howto/revert-a-faulty-merge.txt[revert-a-faulty-merge How-To] for
54
+more details.
55
56
--no-edit::
57
With this option, 'git-revert' will not start the commit