Merge branch 'se/rebase'

[git.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 1e4ba7b209282f0ef16729dfffe8428a549c5f27..b5959d63116aa1e3e900f43a137295b47376e1e0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -111,7 +111,6 @@ git-tag
 git-tar-tree
 git-unpack-file
 git-unpack-objects
-git-unresolve
 git-update-index
 git-update-ref
 git-update-server-info