Skip to content

Commit

Permalink
Merge branch 'gb/maint-am-stgit-author-to-from-fix'
Browse files Browse the repository at this point in the history
* gb/maint-am-stgit-author-to-from-fix:
  am: fix stgit patch mangling
  • Loading branch information
Junio C Hamano committed Sep 2, 2011
2 parents e7734c6 + 45d51dc commit fee6bc5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git-am.sh
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ split_patches () {
perl -ne 'BEGIN { $subject = 0 }
if ($subject > 1) { print ; }
elsif (/^\s+$/) { next ; }
elsif (/^Author:/) { print s/Author/From/ ; }
elsif (/^Author:/) { s/Author/From/ ; print ;}
elsif (/^(From|Date)/) { print ; }
elsif ($subject) {
$subject = 2 ;
Expand Down

0 comments on commit fee6bc5

Please sign in to comment.