Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

  • Loading branch information...
commit 7a3e6fb09a6257b34967af8ac35586aae46af51d 2 parents d4aae8d + cd0a7e6
@jzawodn authored
Showing with 3 additions and 2 deletions.
  1. +1 −0  .bashrc
  2. +2 −2 .emacs
View
1  .bashrc
@@ -98,6 +98,7 @@ alias gs='git status'
alias gg='git pull origin master'
alias gf='git fetch'
alias gm='git merge origin/master'
+alias gpm='git pull origin master'
# Alias definitions.
# You may want to put all your additions into a separate file like
View
4 .emacs
@@ -28,8 +28,8 @@
;(add-to-list 'default-frame-alist '(font . "DejaVu Sans Mono-12"))
;(add-to-list 'default-frame-alist '(font . "DejaVu Sans Mono-10"))
;(add-to-list 'default-frame-alist '(font . "Monospace-10"))
-;(add-to-list 'default-frame-alist '(font . "Terminus-12"))
-(add-to-list 'default-frame-alist '(font . "Terminus-9"))
+(add-to-list 'default-frame-alist '(font . "Terminus-12"))
+;(add-to-list 'default-frame-alist '(font . "Terminus-9"))
;(add-to-list 'default-frame-alist '(font . "Terminus-10"))
;(add-to-list 'default-frame-alist '(font . "DejaVu Sans Mono-10"))
;(add-to-list 'default-frame-alist '(font . "Envy Code R-12"))
Please sign in to comment.
Something went wrong with that request. Please try again.