Permalink
Browse files

resolve merge conflict

  • Loading branch information...
1 parent d97099d commit 878e2ad7375120ae4f8dd6839163282692cc1491 pghosh committed Feb 13, 2013
View
@@ -71,7 +71,7 @@ echo $response | python -mjson.tool
}
#jenkins run
-alias jenkins='java -jar /usr/local/Cellar/jenkins/1.464/libexec/jenkins.war --httpPort=9000'
+alias jenkins='java -jar /usr/local/Cellar/jenkins/1.478/libexec/jenkins.war --httpPort=9000'
#set veriable
SLI_HOME=/Users/pghosh/codebase/sli/sli
@@ -106,5 +106,9 @@ shard() {
   mongo is $SLI_HOME/config/indexes/is_indexes.js
 fi
}
-alias kill-jetty='ps -ef|grep jetty|grep -v grep|awk '{print $2}'|xargs kill -9'
+alias kill-jetty="ps -ef|grep jetty|grep -v grep|awk '{print \$2}'|xargs kill -9"
+alias kill-ruby="ps -ef|grep ruby|grep -v grep|awk '{print \$2}'|xargs kill -9"
+alias kill-tommy="ps -ef|grep tomcat|grep -v grep|awk '{print \$2}'|xargs kill -9"
alias fast-build='mvn clean package install -DskipTests'
+export LZ='/Users/pghosh/codebase/sli/sli/ingestion/ingestion-service/target/ingestion/lz/inbound'
+
View
@@ -4,11 +4,10 @@
pretty = %Cblue%h%Creset %Cgreen[%ar]%Creset (%an) %s
[user]
name = pghosh
- email = pghosh@wgen.net
[color]
status = auto
branch = auto
- ui = true
+ ui = always
[alias]
us = reset HEAD
uc = reset --soft HEAD^
View
7 irbrc
@@ -0,0 +1,7 @@
+require 'rubygems'
+require 'interactive_editor'
+require 'wirble'
+
+Wirble.init
+Wirble.colorize
+
View
@@ -1,5 +1,6 @@
bind C-a send-prefix
set-option -g default-command "reattach-to-user-namespace -l zsh"
+bind-key C-c run-shell "tmux save-buffer - | reattach-to-user-namespace pbcopy"
setw -g mode-mouse on
set -g prefix C-a
View
@@ -1,3 +1,11 @@
let g:netrw_dirhistmax =10
+<<<<<<< HEAD
let g:netrw_dirhist_cnt =1
let g:netrw_dirhist_1='/Users/pghosh/.zsh'
+=======
+let g:netrw_dirhist_cnt =4
+let g:netrw_dirhist_1='/Users/pghosh/.zsh'
+let g:netrw_dirhist_2='/Users/pghosh/Projects/npage/.git'
+let g:netrw_dirhist_3='/Users/pghosh/.vim'
+let g:netrw_dirhist_4='/Users/pghosh/codebase/sli/sli/config/indexes'
+>>>>>>> 788d389... updated vim and other stuff
@@ -0,0 +1,33 @@
+vim-peepopen
+=============
+
+A plugin for the Vim text editor. PeepOpen provides fuzzy search of filenames and paths in a programming project.
+
+Installation
+------------
+
+Get the PeepOpen.app and open it at least once to approve the Mac OS X security dialog.
+
+Standard:
+
+Copy `peepopen.vim` to your `~/.vim/plugin` directory.
+
+With Tim Pope's [Pathogen](http://github.com/tpope/vim-pathogen):
+
+Copy the entire `vim-peepopen` plugin directory to your `~/.vim/bundle` directory.
+
+Usage
+-----
+
+`<Leader>p` opens the current project directory with the PeepOpen application.
+
+Use the [vim-rooter](http://github.com/airblade/vim-rooter) plugin for automatic assignment of the current working directory for projects stored in Git.
+
+(Leader is mapped to '\' by default)
+
+Credits
+-------
+
+- Initial Vim Plugin by [Andrew Stewart](http://www.airbladesoftware.com/).
+- Some plugin boilerplate from [Rein Henrichs](http://reinh.com/).
+
@@ -0,0 +1,44 @@
+" plugin/peepopen.vim
+" Author: Geoffrey Grosenbach <boss@topfunky.com>
+" License: MIT License
+
+" Install this file as plugin/peepopen.vim.
+
+" If you prefer Command-T, use this snippet in your .gvimrc:
+
+" if has("gui_macvim")
+" macmenu &File.New\ Tab key=<nop>
+" map <D-t> <Plug>PeepOpen
+" end
+
+" ============================================================================
+
+" Exit quickly when:
+" - this plugin was already loaded (or disabled)
+" - when 'compatible' is set
+if &cp || exists("g:peepopen_loaded") && g:peepopen_loaded
+ finish
+endif
+let g:peepopen_loaded = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function s:LaunchPeepOpenViaVim()
+ let cwd = getcwd()
+ silent exe "!open \"peepopen://" . shellescape(cwd) . "?editor=MacVim\""
+endfunction
+
+command! PeepOpen :call <SID>LaunchPeepOpenViaVim()
+
+noremap <unique> <script> <Plug>PeepOpen <SID>Launch
+noremap <SID>Launch :call <SID>LaunchPeepOpenViaVim()<CR>
+
+if !hasmapto('<Plug>PeepOpen')
+ map <unique> <silent> <Leader>p <Plug>PeepOpen
+endif
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim:set sw=2 sts=2:
Oops, something went wrong.

0 comments on commit 878e2ad

Please sign in to comment.