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 /Documentation | |
| parent | 3b65c248a384a61501ea0f68a0ef564dcc94c278 (diff) | |
| parent | 4ae048e67e5f0d786b9febc438433d95f18e5937 (diff) | |
| download | git-f97f2e5c645759ec3204ca99cbc5f61caf9201de.tar.gz | |
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 'Documentation')
| -rw-r--r-- | Documentation/git-p4.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index 82aa5d6073..b3e768ee81 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -510,6 +510,10 @@ git-p4.useClientSpec:: option '--use-client-spec'. See the "CLIENT SPEC" section above. This variable is a boolean, not the name of a p4 client. +git-p4.keepEmptyCommits:: + A changelist that contains only excluded files will be imported + as an empty commit if this boolean option is set to true. + Submit variables ~~~~~~~~~~~~~~~~ git-p4.detectRenames:: |