diff --git a/.gitignore b/.gitignore
index e62b9894a..a1bad3c1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,24 @@
+# build directory
+_output
+
+# e2e test executable
+e2e.test
+
+# docker build
+deploy/cephcsi/image/cephcsi
+
+# cached container image IDs
+.devel-container-id
 .test-container-id
+
+# detected 'docker' or 'podman'
+.container-cmd
+
+# git merge files
+*.orig
+*.patch
+*.rej
+
+# generated golangci-lint configuration
+scripts/golangci.yml
+scripts/golangci.yml.buildtags.in