Merge pull request holman#246 from caarlos0/git

moved conditional git configs to git/install.zsh

Author: caarlos0

README.md

@@ -50,7 +50,7 @@ For Linux:
 
 Both:
 
-- `diff-so-fancy`: better git difs (you'll need to run `./script/bootstrap` again)
+- `diff-so-fancy`: better git difs (you'll need to run `dot_update` to apply it)
 
 ## Further help:
 

git/install.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Don't ask ssh password all the time
+if [ "$(uname -s)" = "Darwin" ]; then
+  git config --global user.helper osxkeychain
+else
+  git config --global user.helper cache
+fi
+
+# better diffs
+if which diff-so-fancy > /dev/null 2>&1; then
+  git config --global core.pager "diff-so-fancy | less --tabs=4 -RFX"
+fi

script/bootstrap

@@ -31,18 +31,6 @@ fail () {
   exit
 }
 
-setup_conditional_gitconfig() {
-  if [ "$(uname -s)" = "Darwin" ]; then
-    git config --global user.helper osxkeychain
-  else
-    git config --global user.helper cache
-  fi
-
- if which diff-so-fancy > /dev/null 2>&1; then
-    git config --global core.pager "diff-so-fancy | less --tabs=4 -RFX"
-  fi
-}
-
 setup_gitconfig () {
   info 'setup gitconfig'
   # if there is no user.email, we'll assume it's a new machine/setup and ask it
@@ -68,8 +56,6 @@ setup_gitconfig () {
     # otherwise this gitconfig was already made by the dotfiles
     info "already managed by dotfiles"
   fi
-  # config based on other stuff (OS, installed software, etc)
-  setup_conditional_gitconfig
   # include the gitconfig.local file
   git config --global include.path ~/.gitconfig.local
   # finally make git knows this is a managed config already, preventing later