Permalink
Browse files

Merge branch 'master' of github.com:swanson/in-the-works

  • Loading branch information...
2 parents 1f2bc40 + 916398f commit f5add2bf9b63dfc942f3af3548d552418b71db5b Matt Swanson committed Aug 30, 2010
Showing with 16 additions and 16 deletions.
  1. +4 −4 books.txt
  2. +10 −10 dotfiles/.gitconfig
  3. +2 −2 projects.txt
View
@@ -1,12 +1,12 @@
+Pragmatic programmer
+Apprenticeship Patterns
+Hackers and Painters
--Pro Git
-Expert Python Programming
++Pro Git
+-Expert Python Programming
Python 3 Object Oriented Programming
Code in the Cloud
-Passionate Programmer
--Getting Real
+-Passionate Programmer
++Getting Real
People Ware
Rapid Development
About Face
View
@@ -1,18 +1,18 @@
[core]
- repositoryformatversion = 0
- filemode = true
- bare = false
- logallrefupdates = true
- ignorecase = true
-[remote "origin"]
- fetch = +refs/heads/*:refs/remotes/origin/*
- url = git@github.com:swanson/in-the-works.git
+ repositoryformatversion = 0
+ filemode = true
+ bare = false
+ logallrefupdates = true
+ ignorecase = true
+
[branch "master"]
- remote = origin
- merge = refs/heads/master
+ remote = origin
+ merge = refs/heads/master
+
[user]
name = Matt Swanson
email = mdswanson@sep.com
+
[color]
diff = auto
status = auto
View
@@ -1,5 +1,5 @@
heroku-style deploys for wsgi/flask -- fabric, virtualenv
-developer-centric 'profile' site -- github API etc
+-developer-centric 'profile' site -- github API etc
bookmark site to use flask.embedly
-web.config tool
+-web.config tool
migrate website -- jekyll?

0 comments on commit f5add2b

Please sign in to comment.