adam
/
laughing-hipster
mirror of https://github.com/adamveld12/laughing-hipster
1
0
Fork 0
Code Issues Releases Wiki Activity

merge dot files

pull/1/merge
Adam Veldhousen 2015-01-08 14:01:45 -06:00
parent 34e6f415b6
commit 289b9c7665
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bash_aliases
View File

@ -13,7 +13,6 @@ alias uberbake='~/uberbake.txt'
#tools #tools
alias s='start Source/*.sln' alias s='start Source/*.sln'
alias projects='cd /c/Projects'
alias resrc='source ~/.bash_aliases && source ~/.bashrc && source ~/.profile' alias resrc='source ~/.bash_aliases && source ~/.bashrc && source ~/.profile'
alias role='whoami -groups -fo list | grep -i' alias role='whoami -groups -fo list | grep -i'
alias fu='find ./ -type f -print0 | xargs -0 grep -n $1' alias fu='find ./ -type f -print0 | xargs -0 grep -n $1'
@ -31,6 +30,7 @@ alias dlb='dml'
alias gl='git log --pretty=format:"%h %ar by %an: %s"' alias gl='git log --pretty=format:"%h %ar by %an: %s"'
alias mongodps="mongod --config /usr/local/etc/mongod.conf --fork --logpath ~/.docs/mongo.log" alias mongodps="mongod --config /usr/local/etc/mongod.conf --fork --logpath ~/.docs/mongo.log"
# delete merged local branches # delete merged local branches
function dml(){ function dml(){
for b in `git branch --merged | grep -v \*`; do git branch -D $b; done for b in `git branch --merged | grep -v \*`; do git branch -D $b; done

4
.bashrc
View File

@ -31,6 +31,10 @@ if [ -f ~/.bash_aliases ]; then
fi fi
# enable programmable completion features
if [ -f /etc/git_completion ]; then
. /etc/git_completion
fi
# enable programmable completion features # enable programmable completion features
if [ -f /etc/git_completion ]; then if [ -f /etc/git_completion ]; then
. /etc/git_completion . /etc/git_completion

4
.dev_profile
View File

@ -12,10 +12,10 @@ fi
export GOBIN=${GOPATH}/bin export GOBIN=${GOPATH}/bin
PATH=${PATH}:${GOBIN} PATH=${PATH}:${GOBIN}
export GIT_EDITOR=vim.exe export GIT_EDITOR=~/Tools/vim/gvim.exe
# see environ manfile # see environ manfile
export EDITOR=gvim # Default Editor export EDITOR=$GIT_EDITOR # Default Editor
export VISUAL=$EDITOR # Visual not really used differently from EDITOR anymore export VISUAL=$EDITOR # Visual not really used differently from EDITOR anymore
export LESS='-iMR' # Case insensite search, verbose prompting and raw output export LESS='-iMR' # Case insensite search, verbose prompting and raw output
export PAGER=less # Used to display text / man files export PAGER=less # Used to display text / man files

4
.gitconfig
View File

@ -44,7 +44,6 @@
[difftool "p4diff"] [difftool "p4diff"]
cmd=p4merge.exe -db -nb Base -nl Mine-local -nr Theirs-remote $BASE $LOCAL $REMOTE cmd=p4merge.exe -db -nb Base -nl Mine-local -nr Theirs-remote $BASE $LOCAL $REMOTE
[merge] [merge]
tool = p4merge tool = p4merge
@ -81,7 +80,7 @@
# More info: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/> # More info: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/>
trustctime = false trustctime = false
autocrlf = true autocrlf = true
editor = "EDITOR" editor = "~/Tools/vim/gvim.exe"
[color] [color]
# Use colors in Git commands that are capable of colored output when # Use colors in Git commands that are capable of colored output when
@ -128,7 +127,6 @@
default = current default = current
[pull] [pull]
default = current default = current
[user] [user]
email = adamveld12@gmail.com email = adamveld12@gmail.com
name = Adam Veldhousen name = Adam Veldhousen

3
.work_profile
View File

@ -1,7 +1,6 @@
#!/bin/bash #!/bin/bash
if [[ $DEBUG ]] ; then if [[ $DEBUG ]] ; then
echo "I'm on my work machine!" echo "I'm on my work machine!"
fi fi
alias projects='cd /c/Projects'