Re: [PATCHv2] Have manpage reference new documentation on reverting merges.

From: Junio C Hamano <gitster@pobox.com>
Date: Dec 21, 2008, 21:54 UTC
Message-ID: <7vy6y9kxdh.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <E1LEVxk-0001jS-Cc@rei.iguanasuicide.net>

"Boyd Stephen Smith Jr." <bss@iguanasuicide.net> writes:

> I took the alternative approach.

Thanks. I was thinking about doing this instead; how the reference to the HOW-TO is done is different, and I am hoping that it would give better result for HTML version at least.

 Documentation/git-revert.txt |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git c/Documentation/git-revert.txt w/Documentation/git-revert.txt
index caa0729..b87f2b3 100644
--- c/Documentation/git-revert.txt
+++ w/Documentation/git-revert.txt
@@ -44,6 +44,15 @@ OPTIONS
 	option specifies the parent number (starting from 1) of
 	the mainline and allows revert to reverse the change
 	relative to the specified parent.
++
+By reverting a merge, you are telling git that you never want the changes
+the merge made to your tree.  If the branch the reverted merge merged is
+updated later, and you merge from it again, git remembers this, and only
+brings in the changes on the branch that are made after the previously
+reverted merge.  This may or may not be what you want.
++
+See 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