2 files changed, 4 insertions, 1 deletions

diff --git a/alias b/alias
index 708f3a4..b45c53e 100644
--- a/alias
+++ b/alias
@@ -162,7 +162,9 @@ alias dc='docker-compose run --rm'
 alias ds='docker stop'
 alias drm='docker `docker ps -aq`'
 alias dr='docker run --rm -it'
-alias drb='docker run --rm -it --entrypoint /bin/bash $1'
+drb() {
+  docker run --rm -it --entrypoint /bin/bash $@
+}
 
 # ssh
 alias keygen='ssh-keygen -t rsa -C "typebrook@gmail.com"'
diff --git a/tigrc b/tigrc
index f3ad7a6..26c96c3 100644
--- a/tigrc
+++ b/tigrc
@@ -127,6 +127,7 @@ bind main m ?@git merge %(commit)
 bind main M ?@git merge %(branch) --no-ff
 bind main gm ?@git merge %(remote)/%(branch)         # merge with current remote
 bind main gM ?@git merge %(remote)/%(branch) --no-ff # merge-no-ff with current remote
+bind main gs ?@git merge %(branch) --squash
 
 # push
 bind main p none # override default pager binding