Set global git config when replaying merge

benedikt-schesch · May 7, 2024 · dd2f0fb · dd2f0fb
1 parent b33cedd
commit dd2f0fb
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/src/python/replay_merge.py b/src/python/replay_merge.py
@@ -277,6 +277,7 @@ def merge_replay(
     os.environ["PATH"] += os.pathsep + os.path.join(
         os.getcwd(), "src/scripts/merge_tools"
     )
+    os.environ["GIT_CONFIG_GLOBAL"] = os.getcwd() + "/.gitconfig"
 
     logger.info(f"Replaying merge with index {args.idx}")
     if args.delete_workdir: