diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-12-15 09:34:18 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-12-15 09:34:19 -0800 |
commit | f97f2e5c645759ec3204ca99cbc5f61caf9201de (patch) | |
tree | 4d0f7c2a7ca81312da890461a87ad57c3fcf27fa /git-compat-util.h | |
parent | Merge branch 'jk/prune-mtime' into maint (diff) | |
parent | git-p4: add option to keep empty commits (diff) | |
download | tgif-f97f2e5c645759ec3204ca99cbc5f61caf9201de.tar.xz |
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
Diffstat (limited to 'git-compat-util.h')
0 files changed, 0 insertions, 0 deletions