X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;ds=inline;f=all;h=6afd6dff9de8ef33a0113815cff93fa33e521b11;hb=885913e6b1f85adfe08f771535993d25dd75af30;hp=c1da7075411b58ce3ade3f895d4d8d00e8076adf;hpb=64e26c2fba740409c370ca95aed0e5cfb1ee59a1;p=xonotic%2Fxonotic.git

diff --git a/all b/all
index c1da7075..6afd6dff 100755
--- a/all
+++ b/all
@@ -117,7 +117,7 @@ data/xonotic-nexcompat.pk3dir |
 mediasource                   |                                                   | master      |
 darkplaces                    |                                                   | div0-stable | svn
 fteqcc                        | git://github.com/Blub/qclib.git                   | master      |
-div0-gittools                 | git://git.icculus.org/divverent/div0-gittools.git | master      |
+div0-gittools                 |                                                   | master      |
 netradiant                    |                                                   | master      |
 "
 # todo: in darkplaces, change repobranch to div0-stable
@@ -256,7 +256,7 @@ case "$cmd" in
 					r=${r#refs/heads/}
 					if git config branch.$r.remote >/dev/null 2>&1; then
 						if ! verbose git pull; then
-							fix_upstream_rebase_mergefailed || true
+							fix_upstream_rebase_mergefail || true
 							check_mergeconflict "$d"
 							echo "Pulling failed. Press ENTER to continue, or Ctrl-C to abort."
 							read -r DUMMY