Merge branch 'jk/close-duped-fd-before-unlock-for-bundle'

diff --git a/.gitignore b/.gitignore
index 64b3377d40c35a68a10d5f9e3aa6f3a6fa6aece2..0d77ea5894274c43c4b348c8b52b8e665a1a339e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -81,6 +81,7 @@
 /git-init-db
 /git-interpret-trailers
 /git-instaweb
+/git-legacy-rebase
 /git-log
 /git-ls-files
 /git-ls-remote
@@ -121,7 +122,7 @@
 /git-read-tree
 /git-rebase
 /git-rebase--am
-/git-rebase--helper
+/git-rebase--common
 /git-rebase--interactive
 /git-rebase--merge
 /git-rebase--preserve-merges