rebase: remove the rebase.useBuiltin setting

diff --git a/.gitignore b/.gitignore
index 8bcf153ed93f4a5ea9d9e4e2fd27d89316730e09..5cb84f1d1a9ec556eb2f418da1d174e149a49165 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -82,7 +82,6 @@
 /git-init-db
 /git-interpret-trailers
 /git-instaweb
-/git-legacy-rebase
 /git-log
 /git-ls-files
 /git-ls-remote
@@ -125,7 +124,6 @@
 /git-rebase--am
 /git-rebase--common
 /git-rebase--interactive
-/git-rebase--merge
 /git-rebase--preserve-merges
 /git-receive-pack
 /git-reflog
@@ -230,3 +228,4 @@
 *.pdb
 /Debug/
 /Release/
+*.dSYM