diff --git a/tools/git.sh b/tools/git.sh index 3bd1bf1..e98056e 100644 --- a/tools/git.sh +++ b/tools/git.sh @@ -34,6 +34,7 @@ echo "\n${RED}Git configured with:$DEFAULTC" echo "${GREEN}user.name: ${DEFAULTC}$GITNAME" echo "${GREEN}user.email: ${DEFAULTC}$GITEMAIL" echo "${GREEN}core.editor: ${DEFAULTC}$GITEDITOR" +echo "${GREEN}pull.rebase: ${DEFAULTC}false (merge)" if [[ $answer = [Yy] ]] then echo "${GREEN}commit.codesign: ${DEFAULTC}true"