diff options
| author | Lars Schneider <larsxschneider@gmail.com> | 2015-12-08 10:36:22 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-12-10 10:45:02 -0800 |
| commit | 4ae048e67e5f0d786b9febc438433d95f18e5937 (patch) | |
| tree | ee9c8f52b855abe106f5f749d4added0f09a5f6a /merge-recursive.c | |
| parent | 120c585b229096595b4e54801a538cbef16c8240 (diff) | |
| download | git-4ae048e67e5f0d786b9febc438433d95f18e5937.tar.gz git-4ae048e67e5f0d786b9febc438433d95f18e5937.tar.xz | |
git-p4: add option to keep empty commits
A changelist that contains only excluded files due to a client spec was
imported as an empty commit. Fix that issue by ignoring these commits.
Add option "git-p4.keepEmptyCommits" to make the previous behavior
available.
Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
Helped-by: Pete Harlan
Acked-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions