Merge branch 'ps/stash-in-c'

diff --git a/.gitignore b/.gitignore
index 6fd61c7272fb460c50cc0b1e3a08ce97a6cf912f..44c74402c8c6dedfa24a9f5da6c596c7153b9d25 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -82,7 +82,7 @@
 /git-init-db
 /git-interpret-trailers
 /git-instaweb
-/git-legacy-rebase
+/git-legacy-stash
 /git-log
 /git-ls-files
 /git-ls-remote
@@ -229,3 +229,4 @@
 *.pdb
 /Debug/
 /Release/
+*.dSYM