From f09dc48e306050e67951321aa7f2372f76bf9196 Mon Sep 17 00:00:00 2001
From: Martin Blazik <martin.blazik@gooddata.com>
Date: Mon, 14 Sep 2020 10:07:24 +0200
Subject: [PATCH] Add git aliases

---
 bin/tiger-env.sh      | 15 +++++++++++++++
 scripts/git-config.sh | 21 ++++++++++++++-------
 2 files changed, 29 insertions(+), 7 deletions(-)
 create mode 100644 bin/tiger-env.sh

diff --git a/bin/tiger-env.sh b/bin/tiger-env.sh
new file mode 100644
index 0000000..c4998fe
--- /dev/null
+++ b/bin/tiger-env.sh
@@ -0,0 +1,15 @@
+# must be included
+# TODO add test for running or include
+
+if [[ $_ = $0 ]]; then
+  echo "Must be sourced!"
+else
+  echo "Sourcing ok"
+fi  
+
+alias dcm='docker-compose -f docker-compose.yaml -f docker-compose-monitoring.yaml'
+alias dcfilter="sed -r 's/^[^|]+\| //g'"
+
+export MIN_SERVICES="pulsar-create-namespace postgres redis jaeger router"
+export SERVICES="afm-exec-api sql-executor scan-model router data-loader" 
+
diff --git a/scripts/git-config.sh b/scripts/git-config.sh
index 8d7aae1..c64de16 100755
--- a/scripts/git-config.sh
+++ b/scripts/git-config.sh
@@ -6,19 +6,26 @@ set -x
 #git config --global user.email martin.blazik@gooddata.com
 
 git config --global core.editor vim
+
+git config --global alias.st status
+git config --global alias.br branch
+
 git config --global alias.co checkout
 git config --global alias.cob "checkout -b"
-git config --global alias.br branch
+
 git config --global alias.ci commit
 git config --global alias.cif "commit --fixup"
 git config --global alias.cia "commit --amend"
-git config --global alias.st status
-git config --global alias.unstage "reset HEAD --"
-git config --global alias.ls "log --oneline"
-git config --global alias.aliases "config --get-regexp alias"
-git config --global alias.configs "config --list"
-git config --global alias.undo-commit "reset --soft HEAD^"
+
 git config --global alias.rbi "rebase -i --autosquash"
+git config --global alias.rba "rebase --abort"
+git config --global alias.rbc "rebase --continue"
+
+git config --global alias.unstage "reset HEAD --"
+git config --global alias.undo "reset --soft HEAD^"
 git config --global alias.wipe $'!sh -c \'git push $1 --delete $2\' -'
 git config --global alias.fpa "fetch -p --all"
 
+git config --global alias.ls "log --oneline"
+git config --global alias.aliases "config --get-regexp alias"
+git config --global alias.configs "config --list"