Sync 'ds/multi-pack-index' to v2.19.0-rc0

diff --git a/.gitignore b/.gitignore
index 25633bc51551a1302e23c98799b6a2416aea8eb6..9d1363a1ebce8432c15f610aa7af9520e3e2bb12 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -114,12 +114,14 @@
 /git-pull
 /git-push
 /git-quiltimport
+/git-range-diff
 /git-read-tree
 /git-rebase
 /git-rebase--am
 /git-rebase--helper
 /git-rebase--interactive
 /git-rebase--merge
+/git-rebase--preserve-merges
 /git-receive-pack
 /git-reflog
 /git-remote
@@ -207,6 +209,7 @@
 /config.mak.autogen
 /config.mak.append
 /configure
+/.vscode/
 /tags
 /TAGS
 /cscope*