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)
commit9c51ad58533445719f288f109d90787d99563ec5
treed8f31f76421b37f0e35c9ca015985c4b5f3ccbe6
parent3434569fc206c2f4bc434571d202f2961aa905e5
parent1eadaa3978fb8f9e9d062379fc95a65fb5ff6f8b
Merge branch 'la/quiltimport-keep-non-patch'

"git quiltimport" learned "--keep-non-patch" option.

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