diff --git a/rtc2git.cli.extension/src/to/rtc/cli/migrate/git/GitMigrator.java b/rtc2git.cli.extension/src/to/rtc/cli/migrate/git/GitMigrator.java
index c229d91..03a4523 100644
--- a/rtc2git.cli.extension/src/to/rtc/cli/migrate/git/GitMigrator.java
+++ b/rtc2git.cli.extension/src/to/rtc/cli/migrate/git/GitMigrator.java
@@ -212,6 +212,7 @@ SortedSet<String> getExistingIgnoredFiles() {
 
 	private void gitCommit(PersonIdent ident, String comment) {
 		try {
+			initRootGitignore(rootDir);
 			// add all untracked files
 			Status status = git.status().call();
 
@@ -313,13 +314,18 @@ private void handleJazzignores(Set<String> relativeFileNames) {
 					String gitignoreFile = matcher.group(1).concat(".gitignore");
 					if (jazzIgnore.exists()) {
 						// change/add case
-						List<String> ignoreContent = JazzignoreTranslator.toGitignore(jazzIgnore);
-						Files.writeLines(new File(rootDir, gitignoreFile), ignoreContent, getCharset(), false);
+						if (!".gitignore".equals(gitignoreFile)) {
+							List<String> ignoreContent = JazzignoreTranslator.toGitignore(jazzIgnore);
+							Files.writeLines(new File(rootDir, gitignoreFile), ignoreContent, getCharset(), false);
+							additionalNames.add(gitignoreFile);
+						}
 					} else {
-						// delete case
-						new File(rootDir, gitignoreFile).delete();
+						// delete case except for root git ignore file
+						if (!".gitignore".equals(gitignoreFile)) {
+							new File(rootDir, gitignoreFile).delete();
+							additionalNames.add(gitignoreFile);
+						}
 					}
-					additionalNames.add(gitignoreFile);
 				}
 			}
 			// add additional modified name