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)
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


Trivial merge