Merge branch 'master' of github.com:matthewmccullough/dotfiles

jonsmorrow · Oct 28, 2013 · 8b01430 · 8b01430
2 parents 1318b8c + 44952c1
commit 8b01430
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,12 +1,12 @@
 [submodule "scripts"]
 	path = scripts
-	url = git@github.com:matthewmccullough/scripts.git
+	url = https://github.com/matthewmccullough/scripts.git
 [submodule "z-zsh"]
 	path = z-zsh
-	url = git://github.com/sjl/z-zsh.git
+	url = https://github.com/sjl/z-zsh.git
 [submodule "oh-my-zsh"]
 	path = oh-my-zsh
-	url = git://github.com/robbyrussell/oh-my-zsh.git
+	url = https://github.com/robbyrussell/oh-my-zsh.git
 [submodule "z-rupa"]
 	path = z-rupa
 	url = https://github.com/rupa/z

diff --git a/gitconfig b/gitconfig
@@ -32,7 +32,7 @@
 	recentrepo = /Users/mccm06/Documents/Temp/Scratch/hello/hgw1
 
 [core]
-	excludesfile = /Users/mccm06/.gitignore
+	excludesfile = ~/.gitignore
 	quotepath = false
 	autocrlf = input
 	safecrlf = warn