From: Boyd Stephen Smith Jr. Date: Mon, 22 Dec 2008 00:26:03 GMT Subject: [PATCHv3] Have git revert documentation reference new HOWTO on reverting faulty merges. Message-ID: <200812211826.03208.bss@iguanasuicide.net> In-Reply-To: <7vy6y9kxdh.fsf@gitster.siamese.dyndns.org> Signed-off-by: Boyd Stephen Smith Jr --- On Sunday 2008 December 21 15:54:18 Junio C Hamano wrote: > 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. Here's a pruned version of my prose, with your link style. I prefer my prose because I don't want to use the word "branch", which implies refs having some important in the later merges, which is not the case from what I understand. 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 caa0729..ee9cb82 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 revert commit. +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 -- 1.6.0.2 -- Boyd Stephen Smith Jr. ,= ,-_-. =. bss@iguanasuicide.net ((_/)o o(\_)) ICQ: 514984 YM/AIM: DaTwinkDaddy `-'(. .)`-' http://iguanasuicide.net/ \_/