Browse Source

Merge branch 'gb/maint-am-stgit-author-to-from-fix'

* gb/maint-am-stgit-author-to-from-fix:
  am: fix stgit patch mangling
maint
Junio C Hamano 14 years ago
parent
commit
fee6bc5f03
  1. 2
      git-am.sh

2
git-am.sh

@ -295,7 +295,7 @@ split_patches () { @@ -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 ;

Loading…
Cancel
Save