Commits

Mike Steder  committed 6b5524e

changed bashrc

  • Participants
  • Parent commits f50ba81

Comments (0)

Files changed (1)

 alias log='svn log --stop-on-copy'
 alias uplog='svn up; svn log --stop-on-copy'
 alias status='svn st | grep -Ev "?*resources"'
+alias conflicts='svn st | grep "^[ ]*C"'
 alias whichpkg='dpkg -S'
 #alias kill=skill
 #alias kill=pkill
 # tapp configuration
 #
 EMAIL=michael.steder #youremailusername - for database scrubbing
-export TEXTURA_APPDIR=$HOME/appserver1                # so that you don't have to tell tapp where your environment is
+export TEXTURA_APPDIR=$HOME/TexturaWD                # so that you don't have to tell tapp where your environment is
 export TEXTURA_TTOOLS_VERBOSE=1                                  # display every command that dbmigration and tapp run along with its output
-export TEXTURA_DATABASE_PATH=$HOME/appserver1 # where dumps are stored (defaults to home directory)
+export TEXTURA_DATABASE_PATH=$HOME/TexturaWD # where dumps are stored (defaults to home directory)
 export T=https://dev1.texturallc.net/svn/textura
 
 export TSVN_BASE=~/bugs