mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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>
This commit is contained in:
parent
d5be89d8ad
commit
b80b5d6799
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue