A few updates

radar · Nov 13, 2008 · 41b84b9 · 41b84b9
1 parent f303781
commit 41b84b9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/.gitk b/.gitk
@@ -0,0 +1,3 @@
+set mainfont {Monaco 12}
+set textfont {Monaco 12}
+set uifont {Monaco 12}
diff --git a/bashrc b/bashrc
@@ -49,6 +49,9 @@ alias profileme="history | awk '{print \$2}' | awk 'BEGIN{FS=\"|\"}{print \$1}'
 alias rlog='tail -f -0 ./log/*.log'
 alias ss='ruby ./script/server'
 alias sc='ruby ./script/console'
+alias cdm='cap deploy deploy:migrate'
+
+alias startpg='sudo /Library/StartupItems/PostgreSQL/PostgreSQL start'
 
 # Gem Doc
 export GEMDIR=`gem env gemdir`

diff --git a/gitconfig b/gitconfig
@@ -3,7 +3,7 @@
   email = me@bjeanes.com
 [merge]
   summary = true
-  tool = opendiff
+	tool = opendiff
 [alias]
   co = checkout
   put = push origin HEAD
@@ -16,7 +16,8 @@
   status = auto
   ui = auto
 [github]
-  user = bjeanes
+	user = bjeanes
+	token = df574517df9e5cef449ff0010fdce8b6
 [core]
   editor = mate -w
   excludesfile = ~/.gitignore