Altered PS1 and updated gitconfig
This commit is contained in:
parent
008efba91f
commit
1062255312
4
.bashrc
4
.bashrc
@ -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
|
||||
}
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user