Merge branch 'nd/switch-and-restore'

diff --git a/.gitignore b/.gitignore
index 2374f77a1aae580ed4f71d14e1383bd2dabebd27..40326140c740b57971ba89c5324aaa053d84f8cd 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -122,9 +122,6 @@
 /git-range-diff
 /git-read-tree
 /git-rebase
-/git-rebase--am
-/git-rebase--common
-/git-rebase--interactive
 /git-rebase--preserve-merges
 /git-receive-pack
 /git-reflog
@@ -142,6 +139,7 @@
 /git-request-pull
 /git-rerere
 /git-reset
+/git-restore
 /git-rev-list
 /git-rev-parse
 /git-revert
@@ -166,6 +164,7 @@
 /git-submodule
 /git-submodule--helper
 /git-svn
+/git-switch
 /git-symbolic-ref
 /git-tag
 /git-unpack-file