summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 8bcf153ed9..7374587f9d 100644
--- 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