Skip to content
Browse files

.vimrc conflicts

  • Loading branch information...
2 parents 80f8e7e + d38c554 commit 8c21a95243f878c5bbe4bcce3086fd4822e6cea0 @zarac committed
Showing with 6 additions and 2 deletions.
  1. +1 −0 .bashrc
  2. +5 −2 .vimrc
View
1 .bashrc
@@ -160,6 +160,7 @@ alias gr='git remote -v'
alias gd='git diff'
alias gdc='git diff --cached'
alias gds='git stash show --patience' # might be a better way it does the job)
+alias mahmysql='mysql -h195.178.232.7 -uDA211T10C4062119 -p -DDA211T10C4062119'
# Other
View
7 .vimrc
@@ -659,7 +659,7 @@
" Show the keys as they are pressed.
set showcmd
- """ Windows {{{
+ """ Windows {{{
" resize horizontal splits
nmap + <C-W>+
nmap <A-=> <C-W>-
@@ -877,6 +877,8 @@
"" ToDo:
" nmap <silent> ,io
"" }}}
+
+ "" easier home
nmap <silent> \h :cd ~<CR>
"" easier opening of files at my mah-website
@@ -1074,6 +1076,7 @@
"" filetype {{{
+ """ CSharp / C# / cs.vim {{{
" Handy info: http://vim.wikia.com/wiki/Integrate_gvim_with_Visual_Studio
" http://www.vim.org/scripts/script.php?script_id=1895
" http://kevin-berridge.blogspot.com/2008/09/vim-c-compiling.html
@@ -1143,7 +1146,7 @@
"" }}}
"" *Towelie* {{{
- function! HostnameTowelie()
+ function! HostnameTowelie()
"cd z:\me
cd ~
nmap <silent> ,~ :cd d:\me<CR>

0 comments on commit 8c21a95

Please sign in to comment.
Something went wrong with that request. Please try again.