Mercurial > dotfiles
changeset 113:539d84664c27
Merged changes.
author | Ludovic Chabant <ludovic@chabant.com> |
---|---|
date | Tue, 28 Aug 2012 21:44:37 -0700 |
parents | 9495034e7dc4 (diff) 14307ff18bc1 (current diff) |
children | ccc3902408d2 |
files | hgrc/hgrc vim/vimrc |
diffstat | 5 files changed, 22 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsub Tue May 15 17:08:56 2012 -0700 +++ b/.hgsub Tue Aug 28 21:44:37 2012 -0700 @@ -20,9 +20,9 @@ vim/bundle/syntastic = [git]https://github.com/scrooloose/syntastic.git vim/bundle/less = [git]https://github.com/groenewege/vim-less.git -vim/bundle/lawrencium = ssh://hg@bitbucket.org/ludovicchabant/vim-lawrencium -vim/bundle/piecrust = ssh://hg@bitbucket.org/ludovicchabant/vim-piecrust +vim/bundle/lawrencium = https://bitbucket.org/ludovicchabant/vim-lawrencium +vim/bundle/piecrust = https://bitbucket.org/ludovicchabant/vim-piecrust -lib/hg/hg-git = ssh://hg@bitbucket.org/durin42/hg-git -lib/hg/onsub = ssh://hg@bitbucket.org/ludovicchabant/onsub +lib/hg/hg-git = https://bitbucket.org/durin42/hg-git +lib/hg/onsub = https://bitbucket.org/ludovicchabant/onsub
--- a/.hgsubstate Tue May 15 17:08:56 2012 -0700 +++ b/.hgsubstate Tue Aug 28 21:44:37 2012 -0700 @@ -1,14 +1,14 @@ -dfb2b7b5d586e584280c6640652dc939b4b9120a lib/hg/hg-git +c88e8a88c5f6b9d9f95595a02196bd133d5927d1 lib/hg/hg-git d920e3425db554497a2cfaf1a2548eafbdc8b0e7 lib/hg/onsub -7d5b26907ce4e4d6de7ddf033fee82930733718c vim/bundle/badwolf -8108bffea8c65f10c99578b0edb424ce964d9048 vim/bundle/colorschemes -50b055633580c65c381ebb310bc1786ff14e3340 vim/bundle/commentary -c4fe3045653877518ddbe776a9cb7cbd4fdd0bc8 vim/bundle/ctrlp +cb09bd4000f0d0a971d15f93bc5f8b98a587915a vim/bundle/badwolf +9132dbf0a25bf2c825cf11caf5926758e5048eac vim/bundle/colorschemes +dc349bb7d30f713d770fc1fa0fe209e6aab82dc8 vim/bundle/commentary +b7cb2f539d6f14443ccff7c3fa14da9049bcaab0 vim/bundle/ctrlp 667a668e114e9ec0e5d4cbcb0962d835b23614c4 vim/bundle/easymotion 4f7af188fec24330e7dff99c8758588ae9780347 vim/bundle/fugitive -8078f3e3ed0f8a954d83ab35f238881e9fce479a vim/bundle/gundo +8c570a493d260890242cbdc5a22d8500dc4604cb vim/bundle/gundo 3490c63d6827eb1c5fa31e51f090a7d6ca4bc563 vim/bundle/haml -a63ec818ab216a535258e6ba25596bbb5762421e vim/bundle/lawrencium +ea0ae8f6af81d6b38f2af746ce9e8da615ffbc67 vim/bundle/lawrencium aaf0c284adbda66e3b3c590615a6b6bde3870e43 vim/bundle/less fdc0f091c78cd9a474ac3e3cf40ba7d6933ef9da vim/bundle/markdown 678bb2816874d92bca4eea46e0f5f40a15ddab68 vim/bundle/nerdtree
--- a/bashrc/bashrc Tue May 15 17:08:56 2012 -0700 +++ b/bashrc/bashrc Tue Aug 28 21:44:37 2012 -0700 @@ -5,15 +5,15 @@ # Personal binaries. PATH=$HOME/bin:$PATH -# Local binaries. -PATH=/opt/local/bin:/opt/local/sbin:$PATH - -# Mac developer binaries -PATH=/Developer/usr/bin:$PATH +# Homebrew binaries. +PATH=/usr/local/bin:$PATH # Python from Homebrew PATH=/usr/local/share/python:$PATH +# Ruby from Homebrew +PATH=/usr/local/Cellar/ruby/1.9.3-p194/bin:$PATH + # Done! export PATH
--- a/hgrc/hgrc Tue May 15 17:08:56 2012 -0700 +++ b/hgrc/hgrc Tue Aug 28 21:44:37 2012 -0700 @@ -21,7 +21,7 @@ parentrevspec = [alias] -clog = glog --limit 10 --template "{rev} {bookmarks} {tags} {node|short} {date|shortdate} {author|user}\n{desc}\n\n" +clog = glog --limit 10 --template "{rev} {branches} {bookmarks} {tags} {node|short} {date|shortdate} {author|user}\n{desc}\n\n" [progress] delay = 1 @@ -29,8 +29,8 @@ [schemes] bb+ssh = ssh://hg@bitbucket.org/ bb+me = ssh://hg@bitbucket.org/ludovicchabant/ -gh+ssh = git+ssh://git@github.com: -gh+me = git+ssh://git@github.com:ludovicchabant/ +gh+ssh = git+ssh://git@github.com:{1}/{2}.git +gh+me = git+ssh://git@github.com:ludovicchabant/{1}.git [extdiff] cmd.sbsdiff = diff
--- a/vim/vimrc Tue May 15 17:08:56 2012 -0700 +++ b/vim/vimrc Tue Aug 28 21:44:37 2012 -0700 @@ -284,6 +284,9 @@ " Easier things to type nnoremap <leader>w :w<cr> nnoremap <leader>q :q<cr> +nnoremap <leader>h :Hg +nnoremap <leader>hs :Hgstatus<cr> +nnoremap <leader>hv :Hgvdiff<cr> " Toggle invisible characters nnoremap <leader>i :set list!<cr>