update.sh: abort rebase and merge.

`brew update` can cause these so `brew update` should repair these.

1 files changed, 3 insertions, 0 deletions

diff --git a/Library/Homebrew/cmd/update.sh b/Library/Homebrew/cmd/update.sh
index cff66f7b4..963e13a54 100644
--- a/Library/Homebrew/cmd/update.sh
+++ b/Library/Homebrew/cmd/update.sh
@@ -121,6 +121,8 @@ reset_on_interrupt() {
 
   if [[ -n "$INITIAL_REVISION" ]]
   then
+    git rebase --abort &>/dev/null
+    git merge --abort &>/dev/null
     git reset --hard "$INITIAL_REVISION" "${QUIET_ARGS[@]}"
   fi
 
@@ -179,6 +181,7 @@ pull() {
       git status --short --untracked-files=all
     fi
     git merge --abort &>/dev/null
+    git rebase --abort &>/dev/null
     git -c "user.email=brew-update@localhost" \
         -c "user.name=brew update" \
         stash save --include-untracked "${QUIET_ARGS[@]}"