diff --git a/src/de/uni_passau/fim/seibt/gitwrapper/repo/GitWrapper.java b/src/de/uni_passau/fim/seibt/gitwrapper/repo/GitWrapper.java
index d115da54f2db82662057e04e2d594f099a638f49..1ca6e1a509e3c8fb0991ac0cbc35fb80a5941e89 100644
--- a/src/de/uni_passau/fim/seibt/gitwrapper/repo/GitWrapper.java
+++ b/src/de/uni_passau/fim/seibt/gitwrapper/repo/GitWrapper.java
@@ -2,7 +2,10 @@ package de.uni_passau.fim.seibt.gitwrapper.repo;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Scanner;
@@ -35,6 +38,7 @@ public class GitWrapper extends ToolWrapper {
     private static final String GIT_VERSION_PREFIX = "git version";
 
     private static final Map<String, String> env;
+    private static final List<String> defaultOptions;
 
     static {
         env = new HashMap<>();
@@ -43,6 +47,12 @@ public class GitWrapper extends ToolWrapper {
         env.put("LANGUAGE", locale);
         env.put("LC_ALL", locale);
         env.put("LANG", locale);
+
+        defaultOptions = new ArrayList<>();
+        defaultOptions.add("-c");
+        defaultOptions.add("core.quotePath=false");
+        defaultOptions.add("-c");
+        defaultOptions.add("core.precomposeUnicode=true");
     }
 
     /**
@@ -206,16 +216,27 @@ public class GitWrapper extends ToolWrapper {
     }
 
     /**
-     * Executes '&lt;git command&gt &lt;parameters&gt' and returns the exit code and the output of the command. If there is an
-     * exception executing the command an empty {@link Optional} will be returned.
+     * Executes '&lt;git command&gt &lt;firstParameter&gt &lt;parameters&gt' and returns the exit code and the output
+     * of the command. If there is an exception executing the command an empty {@link Optional} will be returned.
      *
      * @param workingDirectory
      *         the working directory for the command execution
+     * @param firstParameter
+     *         the first git parameter
      * @param parameters
      *         the git parameters
      * @return the result of the execution
      */
-    public Optional<ExecRes> exec(File workingDirectory, String... parameters) {
-        return exec(workingDirectory, true, env, asList(parameters));
+    public Optional<ExecRes> exec(File workingDirectory, String firstParameter, String... parameters) {
+        List<String> pars = new ArrayList<>(defaultOptions.size() + ((parameters != null) ? parameters.length : 0));
+
+        pars.addAll(defaultOptions);
+        pars.add(firstParameter);
+
+        if (parameters != null) {
+            Collections.addAll(pars, parameters);
+        }
+
+        return exec(workingDirectory, true, env, pars);
     }
 }