commit 1c40066ced40131a3912d82b486422187afc87a0 parent d1edbcd5905310dc71c9f3b384b071c12bf87648 Author: hrryt <harry@mayesfield.uk> Date: Wed, 23 Sep 2026 21:14:32 +0100 Handle conflicting remotes Diffstat:
| D | description | | | 1 | - |
| M | push.sh | | | 18 | ++++++++++++++++-- |
| R | publish.sh -> ship.sh | | | 0 |
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/description b/description @@ -1 +0,0 @@ -source code for the ttmaths.uk website diff --git a/push.sh b/push.sh @@ -1,15 +1,29 @@ #!/bin/sh +# cd .. +# git clone --mirror https://git.ttmaths.uk/website.git +# cd website.git +# git --bare update-server-info +# mv hooks/post-update.sample hooks/post-update +# cp ../website/.git/description description +# cd ../website +# git remote add local ../website.git +local=../website.git + +cd "$local" +git remote update --prune +cd - + git push local mkdir stagit cd stagit -stagit .. +stagit ../"$local" cp log.html index.html cp ../stagit.css style.css cp ../icon.png logo.png cp ../icon.png favicon.png -cp -r ../../website.git website.git +cp -r ../"$local" website.git cd .. ./serve.sh stagit git.ttmaths.uk diff --git a/publish.sh b/ship.sh