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


No differences found