Permalink
Browse files

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

  • Loading branch information...
2 parents 2a6fd35 + 5120972 commit fce1b227bfcb77970949797f639a7b2a3d78091c @Shahor committed Jul 11, 2011
Showing with 7 additions and 5 deletions.
  1. +5 −1 .bashrc
  2. +1 −0 .gitignore
  3. +1 −4 .vimrc
View
@@ -18,12 +18,16 @@ if [[ -f ~/.ssh/agent ]]; then
source ~/.ssh/agent
fi
+if [[ -f ~/.git_completion ]]; then
+ source ~/.git_completion
+fi
+
# Prompt section
if [[ -f ~/.bash/prompt.sh ]]; then
source ~/.bash/prompt.sh
else
echo "~/.bash/prompt.sh does not exist, using default prompt"
- export PS1="[\t] \[\e[01;32m\]\u@\h \[\e[01;33m\]\W \e[01;31m\$(check_last_command)\[\e[01;34m\]\[\e[00m\]\$(parse_git_branch) \$ " #default prompt
+ export PS1="[\t] \[\e[01;32m\]\u@\h \[\e[01;33m\]\W \[\e[01;34m\]\[\e[00m\] \$ " #default prompt
fi
# end prompt section
View
@@ -1,3 +1,4 @@
.bash/local_bashrc.sh
.vim/.netrwhist
.vim/bundle/*
+*.swp
View
5 .vimrc
@@ -128,11 +128,8 @@ map <c-h> <c-w>h
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" => Plugins
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+call pathogen#runtime_append_all_bundles()
-if has("gui_running")
-else
- call pathogen#runtime_append_all_bundles()
-end
" Prevents LustyExplorer from whining when vim not compiled with ruby support
let g:LustyExplorerSuppressRubyWarning = 1

0 comments on commit fce1b22

Please sign in to comment.