Merge branch 'bg-submodule-helper-typo' of github.com:pclouds/git-po

[thirdparty/git.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 8bcf153ed93f4a5ea9d9e4e2fd27d89316730e09..7374587f9df901cba0a6990ad48fac17f8a5be57 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -125,7 +125,6 @@
 /git-rebase--am
 /git-rebase--common
 /git-rebase--interactive
-/git-rebase--merge
 /git-rebase--preserve-merges
 /git-receive-pack
 /git-reflog
@@ -230,3 +229,4 @@
 *.pdb
 /Debug/
 /Release/
+*.dSYM