diff options
Diffstat (limited to '')
| -rw-r--r-- | bashrc/main.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bashrc/main.sh b/bashrc/main.sh index 253c943..5ed9b15 100644 --- a/bashrc/main.sh +++ b/bashrc/main.sh @@ -47,23 +47,23 @@ _self_update() { if [[ -n "$_local_changes" ]]; then echo -e "\033[31m*\033[0m You have some uncommited local changes." echo " I will try to preserve it using the git stash." - git stash || return + git stash >/dev/null || return fi - git reset --hard origin/master + git reset --hard origin/master >/dev/null if [[ -n "$_local_commits" ]]; then echo -e "\033[33m*\033[0m cherry-pick: $_local_commits" - git cherry-pick $_local_commits || return + git cherry-pick $_local_commits >/dev/null || return fi if [[ -n "$_local_changes" ]]; then - git stash pop || return + git stash pop >/dev/null || return fi # all done, update old-origin - git branch -D old-origin - git branch old-origin origin/master + git branch -D old-origin >/dev/null 2>&1 + git branch --no-track old-origin origin/master >/dev/null 2>&1 if [[ -e management/symlinks.md5 ]]; then if hash md5sum 2> /dev/null ; then |