diff --git a/Gemfile.lock b/Gemfile.lock
index 08d8e89..d7b02f3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git-fastclone (1.4.3)
+    git-fastclone (1.5.0)
       colorize
 
 GEM
diff --git a/lib/git-fastclone.rb b/lib/git-fastclone.rb
index 56f8c51..695a67a 100644
--- a/lib/git-fastclone.rb
+++ b/lib/git-fastclone.rb
@@ -225,9 +225,8 @@ def clone(url, rev, src_dir, config)
 
       # Only checkout if we're changing branches to a non-default branch
       if rev
-        fail_on_error('git', 'checkout', '--quiet', rev.to_s, quiet: !verbose,
-                                                              print_on_failure: print_git_errors,
-                                                              chdir: File.join(abs_clone_path, src_dir))
+        fail_on_error('git', '-C', File.join(abs_clone_path, src_dir), 'checkout', '--quiet', rev.to_s, quiet: !verbose,
+                                                              print_on_failure: print_git_errors)
       end
 
       update_submodules(src_dir, url)
@@ -249,9 +248,15 @@ def update_submodules(pwd, url)
 
       threads = []
       submodule_url_list = []
+<<<<<<< Updated upstream
       output = fail_on_error('git', 'submodule', 'init', quiet: !verbose,
                                                          print_on_failure: print_git_errors,
                                                          chdir: File.join(abs_clone_path, pwd))
+=======
+      output = ''
+      output = fail_on_error('git', '-C', File.join(abs_clone_path, pwd), 'submodule', 'init', quiet: !verbose,
+                                                         print_on_failure: print_git_errors)
+>>>>>>> Stashed changes
 
       output.split("\n").each do |line|
         submodule_path, submodule_url = parse_update_info(line)
@@ -267,10 +272,9 @@ def update_submodules(pwd, url)
     def thread_update_submodule(submodule_url, submodule_path, threads, pwd)
       threads << Thread.new do
         with_git_mirror(submodule_url) do |mirror, _|
-          cmd = ['git', 'submodule',
+          cmd = ['git', '-C', File.join(abs_clone_path, pwd), 'submodule',
                  verbose ? nil : '--quiet', 'update', '--reference', mirror.to_s, submodule_path.to_s].compact
-          fail_on_error(*cmd, quiet: !verbose, print_on_failure: print_git_errors,
-                              chdir: File.join(abs_clone_path, pwd))
+          fail_on_error(*cmd, quiet: !verbose, print_on_failure: print_git_errors)
         end
 
         update_submodules(File.join(pwd, submodule_path), submodule_url)
@@ -346,8 +350,8 @@ def store_updated_repo(url, mirror, repo_name, fail_hard)
                       quiet: !verbose, print_on_failure: print_git_errors)
       end
 
-      cmd = ['git', 'remote', verbose ? '--verbose' : nil, 'update', '--prune'].compact
-      fail_on_error(*cmd, quiet: !verbose, print_on_failure: print_git_errors, chdir: mirror)
+      cmd = ['git', '-C', mirror, 'remote', verbose ? '--verbose' : nil, 'update', '--prune'].compact
+      fail_on_error(*cmd, quiet: !verbose, print_on_failure: print_git_errors)
 
       reference_updated[repo_name] = true
     rescue RunnerExecutionRuntimeError => e
diff --git a/lib/git-fastclone/version.rb b/lib/git-fastclone/version.rb
index 3b2bd80..325a079 100644
--- a/lib/git-fastclone/version.rb
+++ b/lib/git-fastclone/version.rb
@@ -2,5 +2,5 @@
 
 # Version string for git-fastclone
 module GitFastCloneVersion
-  VERSION = '1.4.3'
+  VERSION = '1.5.0'
 end