[from now] 2014/11/12 10:41:29

diff --git a/gitconfig b/gitconfig
index 6c0965a..7624158 100644
--- a/gitconfig
+++ b/gitconfig
@@ -20,8 +20,8 @@
 [push]
   default = tracking
 [difftool "sourcetree"]
-  cmd = opendiff \"$LOCAL\" \"$REMOTE\"
-  path =
+	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
+	path =
 [mergetool "sourcetree"]
-  cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
-  trustExitCode = true
+	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
+	trustExitCode = true
diff --git a/gitignore b/gitignore
index 0bbc91b..fcaca07 100644
--- a/gitignore
+++ b/gitignore
@@ -1,5 +1,8 @@
 # Generated by http://gitignore.io

+### global
+,*
+
 ### OSX ###
 .DS_Store
 .AppleDouble