Merge branch 'maint'

diff --git a/contrib/remotes2config.sh b/contrib/remotes2config.sh
index dc09eae972711496aa390cb99b3017a936ce1afc..5838b3ab05fb1d9a1cf6a565513b3c7409adc73a 100644 (file)
--- a/contrib/remotes2config.sh
+++ b/contrib/remotes2config.sh
@@ -26,10 +26,8 @@ if [ -d "$GIT_DIR"/remotes ]; then
                                mv "$GIT_DIR"/remotes "$GIT_DIR"/remotes.old
                        fi ;;
                *)
-                       echo "git-config $key "$value" $regex"
-                       git-config $key "$value" $regex || error=1 ;;
+                       echo "git config $key "$value" $regex"
+                       git config $key "$value" $regex || error=1 ;;
                esac
        done
 fi
-
-