summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xgit-update-agent4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-update-agent b/git-update-agent
index 7a0b98d..6d1ebdb 100755
--- a/git-update-agent
+++ b/git-update-agent
@@ -116,8 +116,8 @@ merge() {
if [[ -n "$(git status --untracked-files=all --porcelain 2>/dev/null)" ]]; then
# Abort rebase or merge if initiated
- git merge --abort &>/dev/null
- git rebase --abort &>/dev/null
+ git merge --abort &>/dev/null || true
+ git rebase --abort &>/dev/null || true
stash
STASHED="1"