diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-12-15 08:02:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-12-15 08:02:19 -0800 |
| commit | a899d500c6255c245586e5ef366ad2d99e5db81c (patch) | |
| tree | 209271dfb2f3f24a6e754b23c09d611d277cb2e5 /Documentation | |
| parent | Merge branch 'jk/prune-mtime' (diff) | |
| parent | git-p4: add option to keep empty commits (diff) | |
| download | tgif-a899d500c6255c245586e5ef366ad2d99e5db81c.tar.xz | |
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
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 c3ff7d0d9b..738cfde10c 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -549,6 +549,10 @@ git-p4.largeFilePush:: Boolean variable which defines if large files are automatically pushed to a server. +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:: |