Merge branch 'jh/trace2-sid-fix'

diff --git a/.gitignore b/.gitignore
index 5cb84f1d1a9ec556eb2f418da1d174e149a49165..2374f77a1aae580ed4f71d14e1383bd2dabebd27 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -82,6 +82,7 @@
 /git-init-db
 /git-interpret-trailers
 /git-instaweb
+/git-legacy-stash
 /git-log
 /git-ls-files
 /git-ls-remote
@@ -134,7 +135,6 @@
 /git-remote-ftps
 /git-remote-fd
 /git-remote-ext
-/git-remote-testgit
 /git-remote-testpy
 /git-remote-testsvn
 /git-repack