Merge git://repo.or.cz/git-gui

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index e76093074035d4b9aa4d41e993b5c29e359dad53..599b2fc5711bf6022fdb635b08baac16068de7dd 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -346,7 +346,6 @@ __git_commands ()
                ssh-*)            : transport;;
                stripspace)       : plumbing;;
                svn)              : import export;;
-               svnimport)        : import;;
                symbolic-ref)     : plumbing;;
                tar-tree)         : deprecated;;
                unpack-file)      : plumbing;;