Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
commit 3dad4e21779c47965e87e927d74dfe0b43d72e9a 2 parents b229ff7 + 3f6a802
Travis Mehlinger authored
Showing with 2 additions and 1 deletion.
  1. +1 −1  gitconfig
  2. +1 −0  vim/plugin/settings/molokai.vim
View
2  gitconfig
@@ -4,7 +4,7 @@
ci = commit
- l = log
+ l = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
lp = log --pretty=raw
og = log origin/master..HEAD
View
1  vim/plugin/settings/molokai.vim
@@ -0,0 +1 @@
+hi CursorLine guibg=#111111
Please sign in to comment.
Something went wrong with that request. Please try again.