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

2014-01-03 14:30:06 +01:00 · 2014-01-03 14:30:06 +01:00 · de42d31087
commit de42d31087
parent b4cc15c37a b690aad363
2 changed files with 3 additions and 3 deletions
--- a/.config/terminator/config
+++ b/.config/terminator/config
@ -11,9 +11,9 @@
    cursor_color = "#eee8d5"
    foreground_color = "#eee8d5"
    show_titlebar = False
-    font = Inconsolata for Powerline Medium 12
+    font = Inconsolata Medium 12
    background_color = "#002b36"
-  [layouts]
+[layouts]
  [[default]]
    [[[child1]]]
      type = Terminal
--- a/.gitconfig_includes.common
+++ b/.gitconfig_includes.common
@ -10,5 +10,5 @@
 [core]
 	pager = cat
 [alias]
-    tree = log --show-signature --color --decorate --date=short --all --graph -n 8
+    tree = log --show-signature --color --decorate --date=short --all --graph -n 6