diff options
| author | Boyd Stephen Smith Jr <bss@iguanasuicide.net> | 2008-12-22 03:26:03 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-22 05:34:49 +0300 |
| commit | b80b5d67999dfa5bb1e7ad8ff50142bb371b3746 (patch) | |
| tree | 34a7b18669720d1daed7c6a709245d0bf342fd2f /Documentation/git-revert.txt | |
| parent | d5be89d8ad88792a9716fbfdb499d6d852d0eff5 (diff) | |
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/git-revert.txt')
| -rw-r--r-- | Documentation/git-revert.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt index caa07298a6..5e1175800a 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 |