Merge branch 'ls/p4-keep-empty-commits'
commita899d500c6255c245586e5ef366ad2d99e5db81c
authorJunio C Hamano <gitster@pobox.com>
Tue, 15 Dec 2015 16:02:18 +0000 (15 08:02 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Dec 2015 16:02:19 +0000 (15 08:02 -0800)
tree209271dfb2f3f24a6e754b23c09d611d277cb2e5
parent897b18508b5c57f94730d862ad6620d56cd1d856
parent4ae048e67e5f0d786b9febc438433d95f18e5937
Merge branch 'ls/p4-keep-empty-commits'

"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
Documentation/git-p4.txt
git-p4.py