Merge branch 'la/quiltimport-keep-non-patch'
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Jan 2019 21:49:52 +0000 (13:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Jan 2019 21:49:52 +0000 (13:49 -0800)
"git quiltimport" learned "--keep-non-patch" option.

* la/quiltimport-keep-non-patch:
  git-quiltimport: add --keep-non-patch option


Trivial merge