diff --git a/packages/core/src/services/gitService.test.ts b/packages/core/src/services/gitService.test.ts
index 93e2750d..d0b991a3 100644
--- a/packages/core/src/services/gitService.test.ts
+++ b/packages/core/src/services/gitService.test.ts
@@ -188,6 +188,18 @@ describe('GitService', () => {
     const repoDir = path.join(mockHomedir, '.gemini', 'history', mockHash);
     const hiddenGitIgnorePath = path.join(repoDir, '.gitignore');
     const visibleGitIgnorePath = path.join(mockProjectRoot, '.gitignore');
+    const gitConfigPath = path.join(repoDir, '.gitconfig');
+
+    it('should create a .gitconfig file with the correct content', async () => {
+      const service = new GitService(mockProjectRoot);
+      await service.setupShadowGitRepository();
+      const expectedConfigContent =
+        '[user]\n  name = Gemini CLI\n  email = gemini-cli@google.com\n[commit]\n  gpgsign = false\n';
+      expect(hoistedMockWriteFile).toHaveBeenCalledWith(
+        gitConfigPath,
+        expectedConfigContent,
+      );
+    });
 
     it('should create history and repository directories', async () => {
       const service = new GitService(mockProjectRoot);
diff --git a/packages/core/src/services/gitService.ts b/packages/core/src/services/gitService.ts
index 83f1fec2..bd7b72fd 100644
--- a/packages/core/src/services/gitService.ts
+++ b/packages/core/src/services/gitService.ts
@@ -54,18 +54,24 @@ export class GitService {
    */
   async setupShadowGitRepository() {
     const repoDir = this.getHistoryDir();
+    const gitConfigPath = path.join(repoDir, '.gitconfig');
 
     await fs.mkdir(repoDir, { recursive: true });
-    const isRepoDefined = await simpleGit(repoDir).checkIsRepo(
-      CheckRepoActions.IS_REPO_ROOT,
-    );
+
+    // We don't want to inherit the user's name, email, or gpg signing
+    // preferences for the shadow repository, so we create a dedicated gitconfig.
+    const gitConfigContent =
+      '[user]\n  name = Gemini CLI\n  email = gemini-cli@google.com\n[commit]\n  gpgsign = false\n';
+    await fs.writeFile(gitConfigPath, gitConfigContent);
+
+    const repo = simpleGit(repoDir);
+    const isRepoDefined = await repo.checkIsRepo(CheckRepoActions.IS_REPO_ROOT);
 
     if (!isRepoDefined) {
-      await simpleGit(repoDir).init(false, {
+      await repo.init(false, {
         '--initial-branch': 'main',
       });
 
-      const repo = simpleGit(repoDir);
       await repo.commit('Initial commit', { '--allow-empty': null });
     }
 
@@ -89,6 +95,9 @@ export class GitService {
     return simpleGit(this.projectRoot).env({
       GIT_DIR: path.join(repoDir, '.git'),
       GIT_WORK_TREE: this.projectRoot,
+      // Prevent git from using the user's global git config.
+      HOME: repoDir,
+      XDG_CONFIG_HOME: repoDir,
     });
   }