Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

update dotfiles

  • Loading branch information...
commit a8fbb3ecedda4d71df93d6114fbb65ed7b7ff981 1 parent e2ee3e4
@ametaireau authored
Showing with 22 additions and 3 deletions.
  1. +10 −0 .functions
  2. +8 −0 .gitconfig
  3. +2 −2 .vimrc
  4. +2 −1  .zshrc
View
10 .functions
@@ -28,3 +28,13 @@ function update_zamboni() {
pip install --no-deps --exists-action=w -r requirements/dev.txt
schematic migrations
}
+
+function merge_pull_request() {
+ echo $1
+ git remote add $1 git://github.com/$1/$2.git
+ git fetch $1
+ git checkout $3
+ git rebase master
+ git checkout master
+ git merge $3
+}
View
8 .gitconfig
@@ -7,3 +7,11 @@
user = ametaireau
[core]
excludesfile = /home/alexis/.gitignore
+[giggle]
+ main-window-maximized = true
+ main-window-geometry = 700x550+49+24
+ history-view-vpane-position = 469
+ main-window-view = HistoryView
+ file-view-vpane-position = 356
+[alias]
+co = checkout
View
4 .vimrc
@@ -48,8 +48,8 @@ vnoremap <tab> %
set wrap
set textwidth=79
set formatoptions=qrn1
-set list
-set listchars=tab:\
+"set list
+"set listchars=tab:▸/
"set acd " auto change directory
set laststatus=2 " Always set a status line
View
3  .zshrc
@@ -3,10 +3,11 @@ ZSH=$HOME/.oh-my-zsh
ZSH_THEME="kennethreitz"
COMPLETION_WAITING_DOTS="true"
-plugins=(git python debian github pip)
+plugins=(python debian github pip)
export EDITOR="vim"
source $ZSH/oh-my-zsh.sh
source /usr/local/bin/virtualenvwrapper.sh
source $HOME/.functions
source $HOME/.aliases
+export PIP_DOWNLOAD_CACHE="~/.pipcache"
Please sign in to comment.
Something went wrong with that request. Please try again.