Skip to content

Commit b80b5d6

Browse files
stephen-smithgitster
authored andcommitted
git-revert documentation: refer to new HOWTO on reverting faulty merges
Signed-off-by: Boyd Stephen Smith Jr <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d5be89d commit b80b5d6

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

Documentation/git-revert.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,14 @@ OPTIONS
4444
option specifies the parent number (starting from 1) of
4545
the mainline and allows revert to reverse the change
4646
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.
4755

4856
--no-edit::
4957
With this option, 'git-revert' will not start the commit

0 commit comments

Comments
 (0)