Altered PS1 and updated gitconfig

This commit is contained in:
Tony Grosinger 2014-01-03 08:00:45 -08:00
parent 008efba91f
commit 1062255312
2 changed files with 4 additions and 6 deletions

View File

@ -1,3 +1,6 @@
# Prompt
PS1="\n[ \w ]--[\$(ls -1 | wc -l | sed 's: ::g') files]\n\h\$ "
# Navigation
if [[ ! "$OSTYPE" == darwin* ]];
then
@ -40,3 +43,4 @@ function fn() {
find `pwd` -name $1
fi
}

View File

@ -11,9 +11,3 @@
pp = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
type = cat-file -t
dump = cat-file -p
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true