Merge branch 'ls/p4-keep-empty-commits' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 15 Dec 2015 17:34:18 +0000 (09:34 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Dec 2015 17:34:19 +0000 (09:34 -0800)
commitf97f2e5c645759ec3204ca99cbc5f61caf9201de
tree4d0f7c2a7ca81312da890461a87ad57c3fcf27fa
parent3b65c248a384a61501ea0f68a0ef564dcc94c278
parent4ae048e67e5f0d786b9febc438433d95f18e5937
Merge branch 'ls/p4-keep-empty-commits' into maint

"git p4" used to import Perforce CLs that touch only paths outside
the client spec as empty commits.  It has been corrected to ignore
them instead, with a new configuration git-p4.keepEmptyCommits as a
backward compatibility knob.

* ls/p4-keep-empty-commits:
  git-p4: add option to keep empty commits
git-p4.py