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

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 5046f699349aa87bedbc79a997dfcb9ea54e7618..791e30f6d78b06429f239defc76aaa0d09db4e09 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -999,7 +999,8 @@ _git_config ()
                gitcvs.enabled
                gitcvs.logfile
                gitcvs.allbinary
-               gitcvs.dbname gitcvs.dbdriver gitcvs.dbuser gitcvs.dvpass
+               gitcvs.dbname gitcvs.dbdriver gitcvs.dbuser gitcvs.dbpass
+               gitcvs.dbtablenameprefix
                gc.packrefs
                gc.reflogexpire
                gc.reflogexpireunreachable