aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorBoyd Stephen Smith Jr <bss@iguanasuicide.net>2008-12-21 18:26:03 -0600
committerJunio C Hamano <gitster@pobox.com>2008-12-21 18:34:49 -0800
commitb80b5d67999dfa5bb1e7ad8ff50142bb371b3746 (patch)
tree34a7b18669720d1daed7c6a709245d0bf342fd2f /Documentation
parentd5be89d8ad88792a9716fbfdb499d6d852d0eff5 (diff)
downloadgit-b80b5d67999dfa5bb1e7ad8ff50142bb371b3746.tar.gz
git-b80b5d67999dfa5bb1e7ad8ff50142bb371b3746.tar.xz
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>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-revert.txt8
1 files changed, 8 insertions, 0 deletions
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