x/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

You know, resolving some conflicts...

Browse Source
This commit is contained in:
Dan Buch 2013-12-28 12:39:39 -05:00
parent 3bd64cb384
commit 507145b0db
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bash_profile
View File

@ -68,7 +68,7 @@ _bash_profile_main() {
_source_bash_extras _source_bash_extras
get_ssh_agent get_ssh_agent
get_gpg_agent which gpg-agent && test -d ~/.gnupg && get_gpg_agent
#_source_if_exists "$HOME/.gvm/scripts/gvm" #_source_if_exists "$HOME/.gvm/scripts/gvm"
#_source_if_exists "$HOME/.gvmrc" #_source_if_exists "$HOME/.gvmrc"

2
gitconfig
View File

@ -16,7 +16,7 @@
receivepack = true receivepack = true
[push] [push]
default = tracking default = matching
[color] [color]
ui = auto ui = auto