mirror of
http://git.nowherejezfoltodf4jiyl6r56jnzintap5vyjlia7fkirfsnfizflqd.onion/nihilist/blog-deploy.git
synced 2025-05-15 19:37:08 +00:00
fix entry.sh to rebase upon pulls
This commit is contained in:
parent
ed4d26da51
commit
122dc8f328
1 changed files with 1 additions and 0 deletions
1
entry.sh
1
entry.sh
|
@ -10,6 +10,7 @@ while true; do
|
||||||
echo "$(date): Cloning or updating the repository..."
|
echo "$(date): Cloning or updating the repository..."
|
||||||
git config --global --add safe.directory /repo
|
git config --global --add safe.directory /repo
|
||||||
git config --global --add http.proxy socks5h://localhost:9050
|
git config --global --add http.proxy socks5h://localhost:9050
|
||||||
|
git config --global pull.rebase true
|
||||||
if [ -d "/repo/.git" ]; then
|
if [ -d "/repo/.git" ]; then
|
||||||
git stash
|
git stash
|
||||||
#git submodule foreach 'git stash; git reset --hard'
|
#git submodule foreach 'git stash; git reset --hard'
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue