kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Boyd Stephen Smith Jr 2008-12-21 18:26:03 -06:00 committed by Junio C Hamano
parent d5be89d8ad
commit b80b5d6799
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/git-revert.txt
View File

@ -44,6 +44,14 @@ OPTIONS
option specifies the parent number (starting from 1) of option specifies the parent number (starting from 1) of
the mainline and allows revert to reverse the change the mainline and allows revert to reverse the change
relative to the specified parent. 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:: --no-edit::
With this option, 'git-revert' will not start the commit With this option, 'git-revert' will not start the commit