kienan
/
ttrss-container
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hide git warning re: rebase

This commit is contained in:
Andrew Dolgov 2021-02-05 23:23:57 +03:00
parent c1ad950797
commit ce945d6acb
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/startup.sh
View File

@ -33,6 +33,7 @@ else
echo updating tt-rss source in $DST_DIR from $SRC_REPO... echo updating tt-rss source in $DST_DIR from $SRC_REPO...
cd $DST_DIR && \ cd $DST_DIR && \
git config core.filemode false && \ git config core.filemode false && \
git config pull.rebase false && \
git pull origin master || echo error: unable to update master repository. git pull origin master || echo error: unable to update master repository.
fi fi
@ -49,6 +50,7 @@ else
echo updating plugins.local/nginx_xaccel... echo updating plugins.local/nginx_xaccel...
cd $DST_DIR/plugins.local/nginx_xaccel && \ cd $DST_DIR/plugins.local/nginx_xaccel && \
git config core.filemode false && \ git config core.filemode false && \
git config pull.rebase false && \
git pull origin master || echo error: failed to update plugin repository. git pull origin master || echo error: failed to update plugin repository.
fi fi