From be0c1af558bd70167e55ee06f3d0d1fdc6963fd2 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Mon, 2 Jul 2018 16:01:00 +0300 Subject: [PATCH] KT-9945 git: enable committing "converted to kotlin" files with two separate commits * Necessary support is added into 1.2.60 version of Kotlin plugin --- platform/util/resources/misc/registry.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties index 1e7895a76166..8795d29d0b04 100644 --- a/platform/util/resources/misc/registry.properties +++ b/platform/util/resources/misc/registry.properties @@ -1143,7 +1143,7 @@ git.refresh.vfs.total.description=If set to true, the whole Git repository root Otherwise only the affected files will be refreshed.\ Affects only a subset of Git operations.\ The option is needed to debug possible "incomplete VFS refresh" reports, if they appear. -git.allow.explicit.commit.renames=false +git.allow.explicit.commit.renames=true git.allow.explicit.commit.renames.description=Enable option to commit some "rename + modification" as two commits to help git track file history (ex: for files, converted from Java to Kotlin). git.force.commit.using.staging.area=false git.force.commit.using.staging.area.description=When enabled, perform all git commits by updating staging area. If disabled, use `git commit --only` when possible.