From 4deebb671c720c7dbb29f2581636f87b45bd3606 Mon Sep 17 00:00:00 2001 From: Marissa Staib Date: Wed, 25 Sep 2019 23:32:12 +0000 Subject: [PATCH] Autocommitted updated scripts from blocky-cafe --- bash_aliases.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bash_aliases.sh b/bash_aliases.sh index 5c7edb2..8b6c9de 100644 --- a/bash_aliases.sh +++ b/bash_aliases.sh @@ -68,11 +68,12 @@ function sync_git_only() git commit -am "Autocommitted updated scripts from $(hostname)" fi git pull --rebase - if ! git diff --exit-code origin/master master; then - git log --reverse origin/master..master + if ! git --no-pager diff --exit-code origin/master master; then + git --no-pager log --reverse origin/master..master if ! read -p "OK to push these changes? (Y/N) " -N 1 confirm; then confirm = "N" fi + echo if [[ "$confirm" != "Y" ]] && [[ "$confirm" != "y" ]]; then echo "Not pushing yet." else