Merge pull request #1 from brunocvcunha/update

improvements
bvolpato · Oct 23, 2017 · 3763b40 · 3763b40
2 parents 2cce11b + a9ca6d0
commit 3763b40
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/bash_profile b/bash_profile
@@ -42,6 +42,9 @@ export SDKMAN_DIR="${HOME}/.sdkman"
 eval "$(thefuck --alias)"
 eval $(/usr/libexec/path_helper -s)
 
+GPG_TTY=$(tty)
+export GPG_TTY
+
 
 if [ -f `which powerline-daemon` ]; then
     powerline-daemon -q

diff --git a/functions b/functions
@@ -413,7 +413,7 @@ function resolveip() {
 #get my remote ip
 # could use: ifconfig.me/ip
 function httpip() {
-  curl -sk http://ipinfo.io/ip
+  curl https://ipinfo.io/ip
 }
 function httphost() {
   curl -sk http://ifconfig.me/host
@@ -1139,7 +1139,7 @@ function gitescalatebranches() {
     echo "Merge origin/$currentBranch into $branch"
     git checkout $branch
     git pull
-    git merge "origin/$currentBranch" --commit --no-edit
+    git merge "origin/$currentBranch" --commit --no-ff --no-edit
     git push
 
     currentBranch=$branch