diff --git a/cmd/execute_test.go b/cmd/execute_test.go
index 0f159d2..8d1e532 100644
--- a/cmd/execute_test.go
+++ b/cmd/execute_test.go
@@ -25,6 +25,7 @@ func TestRootCmd(t *testing.T) {
 		"/dev/null",
 		"--dry-run",
 		"--dump-only",
+		"--no-git",
 		"--api-server",
 		"http://192.0.2.1", // RFC 5737 reserved/unroutable
 		"--log-level",
diff --git a/pkg/recorder/recorder.go b/pkg/recorder/recorder.go
index d54eb69..c8210d5 100644
--- a/pkg/recorder/recorder.go
+++ b/pkg/recorder/recorder.go
@@ -157,7 +157,7 @@ func (w *Listener) save(file string, data []byte) error {
 		return fmt.Errorf("can't create local directory %s: %v", dir, err)
 	}
 
-	tmpf, err := afero.TempFile(appFs, "", "katafygio")
+	tmpf, err := afero.TempFile(appFs, dir, ".temp-katafygio-")
 	if err != nil {
 		return fmt.Errorf("failed to create a temporary file: %v", err)
 	}
diff --git a/pkg/store/git/git.go b/pkg/store/git/git.go
index 557d4a7..2338033 100644
--- a/pkg/store/git/git.go
+++ b/pkg/store/git/git.go
@@ -174,6 +174,11 @@ func (s *Store) CloneOrInit() (err error) {
 			s.Email, s.LocalDir, err)
 	}
 
+	err = afero.WriteFile(appFs, s.LocalDir+"/.git/info/exclude", []byte(".temp-katafygio-*"), 0644)
+	if err != nil {
+		return fmt.Errorf("failed to create a git exclusion: %v", err)
+	}
+
 	return nil
 }