summaryrefslogtreecommitdiff
path: root/.gitconfig
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2011-11-16 16:20:12 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2011-11-16 16:20:12 -0500
commit1111923a0f8daf24984e13bc1da2295c4e16157c (patch)
treeefb18952f2e05c9131250a08e3bea2ab177d8635 /.gitconfig
parenta7f367af4201eee04dd34a008c4299cd82c02d0a (diff)
parent86e56415e8c8081c99b99209182a6b5b34361d74 (diff)
Merge branch 'master' of git://gitorious.org/lukeshu-dotfiles/lukeshu-dotfiles
Conflicts: .bashrc .profile
Diffstat (limited to '.gitconfig')
0 files changed, 0 insertions, 0 deletions