X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;ds=sidebyside;f=.gitignore;h=7374587f9df901cba0a6990ad48fac17f8a5be57;hb=31f5256c82a36edea3ea2f91e5171e3472878915;hp=8bcf153ed93f4a5ea9d9e4e2fd27d89316730e09;hpb=d6cc13602bdd61d6f12a5fc10b2d342033502afa;p=thirdparty%2Fgit.git

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