This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Note the --author option of git commit, and therefore explain how to apply raw diffs.
authorVincent Pit <perl@profvince.com>
Mon, 22 Dec 2008 20:15:14 +0000 (21:15 +0100)
committerVincent Pit <perl@profvince.com>
Mon, 22 Dec 2008 20:15:14 +0000 (21:15 +0100)
pod/perlrepository.pod

index 34d464e..80e2bf8 100644 (file)
@@ -304,11 +304,16 @@ switch into it:
 
   % git checkout -b experimental
 
-Now we should apply the patch:
+Patches that were formatted by C<git format-patch> are applied with C<git am>:
 
   % git am 0001-Rename-Leon-Brocard-to-Orange-Brocard.patch
   Applying Rename Leon Brocard to Orange Brocard
 
+If just a raw diff is provided, it is also possible use this two-step process:
+
+  % git apply bugfix.diff
+  % git commit -am "Some fixing" --author="That Guy <that.guy@internets.com>"
+
 Now we can inspect the change:
 
   % git log