R. Alex Matevish 1 year ago
parent
commit
0f154b17c1
3 changed files with 6 additions and 0 deletions
  1. 1 0
      asana.sh
  2. 2 0
      conf.sh
  3. 3 0
      git.sh

+ 1 - 0
asana.sh

@@ -14,3 +14,4 @@ alias bldb="b $LDB_BUILD"
 ##### Datadog stuff
 export DD_CLIENT_APP_KEY=5888ff25393b1ba313bb722ba8ba24bf5e56d8dc
 export DD_CLIENT_API_KEY=b21ac9884a51167a428f88322ef244fb
+export SECRET_datadog="{\"api_key\": \"$DD_CLIENT_APP_KEY\", \"kube_app_key\": \"$DD_CLIENT_API_KEY\"}"

+ 2 - 0
conf.sh

@@ -6,3 +6,5 @@
 export CONFIG_OUTPUT_FILE="common.sh"
 export CONFIG_INSTALL_DIR="/Users/alexmatevish/.configs/sh-common"
 declare -a INSTALLED_CONFIGS=("main" "wintermute" "mac" "git" "docker" "pgp" "asana")
+
+export IMGUR_CLIENT_ID=0db8b3c3e10d89b

+ 3 - 0
git.sh

@@ -19,6 +19,7 @@ if command_exists git; then
     git config --global alias.st stash
     git config --global alias.cp cherry-pick
     git config --global alias.w switch
+    git config --global alias.pm "checkout alexmatevish-master"
 
     git config --global alias.bn "rev-parse --abbrev-ref HEAD"  # branch-name
     git config --global alias.psc "push origin \`git rev-parse --abbrev-ref HEAD\`"  # push current
@@ -26,6 +27,8 @@ if command_exists git; then
     git config --global alias.lco "log -n 1 --pretty=format:'%h'"
     git config --global alias.bp "merge-base --octopus master"
     git config --global alias.mod "!git status -s | grep -r '.*\.scala' | cut -f4 -d' '"
+    
+    git config --global alias.lp "log --pretty=format:\"%h%x09%an%x09%ad%x09%s\""
 
     alias g='git'
     alias gs='git s'