From 7f54f652e89f28c87bdbed6bd1391ae5bf9520f7 Mon Sep 17 00:00:00 2001 From: Tobias Schmidl Date: Fri, 3 Nov 2017 12:06:50 +0100 Subject: [PATCH] --- bootstrap.sh | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index 79d9800..202f380 100644 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -57,20 +57,24 @@ sed -i 's/^\(ZSH_THEME="\)robbyrussell/\1gallifrey/;s/^\(plugins=(\)git)/\1git t echo '[[ -z "$EDITOR" ]] && export EDITOR=/etc/alternatives/editor' >> .zshrc git config --global user.name "Tobias Schmidl" -git config --global 'url.https://.insteadof' 'http://' -git config --global rebase.autosquash true -git config --global credential.helper store -git config --global diff.renames copies -git config --global diff.renamelimit 65536 -git config --global http.sslverify true -git config --global http.sslversion tlsv1.2 -git config --global merge.renormalize true -git config --global merge.conflictstyle diff3 -git config --global pack.threads 0 -git config --global pull.rebase true +git config --global branch.autosetuprebase always git config --global branch.master.rebase true git config --global core.autocrlf input -git config --global gitflow.branch.master stable +git config --global core.whitespace 'trailing-space,tab-in-ident,indent-with-non-tab,space-before-tab,tabwidth=4' +git config --global credential.helper store +git config --global diff.renamelimit 65536 +git config --global diff.renames copies git config --global gitflow.branch.develop master +git config --global gitflow.branch.master stable git config --global gitflow.prefix.feature 'dev/' -git config --global branch.autosetuprebase true +git config --global http.sslverify true +git config --global http.sslversion tlsv1.2 +git config --global merge.conflictstyle diff3 +git config --global merge.renormalize true +git config --global pack.threads 0 +git config --global pull.rebase true +git config --global rebase.autosquash true +git config --global 'url.https://.insteadof' 'http://' +git config --global tig.blob-view 'line-number:yes,interval=5 text' +git config --global tig.line-graphics utf-8 +git config --global tig.tab-size 4