From: Alex Vandiver <alex@chmrr.net>
Date: Mon, 5 Oct 2009 23:45:58 +0000 (+0100)
Subject: Note the one mistake in perl.git's history, and the appropriate graft to remove it
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=e8589bfa4f54a6aef9fec2e240f9897af090ee30;p=p5sagit%2Fp5-mst-13.2.git

Note the one mistake in perl.git's history, and the appropriate graft to remove it

Message-Id: <1254775127-18136-1-git-send-email-alex@chmrr.net>
---

diff --git a/pod/perlrepository.pod b/pod/perlrepository.pod
index 8f413a7..f1d439e 100644
--- a/pod/perlrepository.pod
+++ b/pod/perlrepository.pod
@@ -692,6 +692,20 @@ using the C<git cherry-pick> command. It is recommended to use the
 B<-x> option to C<git cherry-pick> in order to record the SHA1 of the
 original commit in the new commit message.
 
+=head1 GRAFTS
+
+The perl history contains one mistake which was not caught in the
+conversion -- a merge was recorded in the history between blead and
+maint-5.10 where no merge actually occurred.  Due to the nature of
+git, this is now impossible to fix in the public repository.  You can
+remove this mis-merge locally by adding the following line to your
+C<.git/info/grafts> file:
+
+  296f12bbbbaa06de9be9d09d3dcf8f4528898a49 434946e0cb7a32589ed92d18008aaa1d88515930
+
+It is particularly important to have this graft line if any bisecting
+is done in the area of the "merge" in question.
+
 =head1 SEE ALSO
 
 The git documentation, accessible via C<git help command>.