From: Ricardo Signes Date: Sun, 3 Jul 2011 12:53:13 +0000 (-0400) Subject: remove another duplicated section X-Git-Tag: accepted/trunk/20130322.191538~3473 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=04baf1ffb6507bd8c7b4c25e5b5e3b348d0dd6fd;p=platform%2Fupstream%2Fperl.git remove another duplicated section (unrelated whitespace fixes also included) --- diff --git a/pod/perlgit.pod b/pod/perlgit.pod index 0c889b7..b450664 100644 --- a/pod/perlgit.pod +++ b/pod/perlgit.pod @@ -591,6 +591,7 @@ to push your changes back with the C remote: The C command just updates the C refs, as the objects themselves should have been fetched when pulling from C. + =head1 Accepting a patch If you have received a patch file generated using the above section, @@ -687,7 +688,7 @@ look in F. =item * If you make any changes that affect miniperl or core routines that have -different code paths for miniperl, be sure to run C. +different code paths for miniperl, be sure to run C. This will catch problems that even the full test suite will not catch because it runs a subset of tests under miniperl rather than perl. @@ -715,20 +716,6 @@ original commit in the new commit message. Before pushing any change to a maint version, make sure you've satisfied the steps in L above. -=head2 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. - =head2 Merging from a branch via GitHub While we don't encourage the submission of patches via GitHub, that