small fixes

This commit is contained in:
teldra 2022-06-26 20:13:20 +02:00
parent f3fcb4f9e5
commit 86c3926b8f
1 changed files with 5 additions and 0 deletions

View File

@ -14,6 +14,7 @@ if ! grep name ~/.gitconfig && ! grep name ~/.git/config; then
git config user.name "${name}"
fi
# check if user has configured an email address in git and set it, if not
if ! grep email ~/.gitconfig && ! grep email ~/.git/config; then
echo "You need an email! It is not important. If you choose none, it will be 'info@bunteshaus.de'."
echo "Write 'exit' or press 'Strg+c' to cancel."
@ -27,6 +28,10 @@ if ! grep email ~/.gitconfig && ! grep email ~/.git/config; then
git config user.email "${email}"
fi
if ! grep rebase ~/.gitconfig && ! grep rebase ~/.git/config; then
git config pull.rebase true
fi
# update from upstream/main
git pull --rebase upstream main && \