Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Oct 2015 22:22:39 +0000 (15:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Oct 2015 22:22:39 +0000 (15:22 -0700)
commit44a9b53c599447a706dd4ae8a00fd8b4bed093b9
treec74c4e45ebad4b84b0651f05c6920db447af34fd
parent1b5ffa36cb02103057e5de8de8bf86419bc5502f
parenta5a4b3ff4d73be736984fd499551b1b0c10d33a1
Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maint

A recent "filter-branch --msg-filter" broke skipping of the commit
object header, which is fixed.

* jk/filter-branch-use-of-sed-on-incomplete-line:
  filter-branch: remove multi-line headers in msg filter