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
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