From 3c91f5858a273733112cdd11373762e4b9357c1b Mon Sep 17 00:00:00 2001
From: Mike McQuaid
Date: Thu, 26 Jan 2017 16:29:39 +0000
Subject: update-reset: checkout with --force.

Otherwise it won't overwrite unmerged changes.
---
 Library/Homebrew/cmd/update-reset.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Library')

diff --git a/Library/Homebrew/cmd/update-reset.sh b/Library/Homebrew/cmd/update-reset.sh
index 32daffc96..3a9e1caa9 100644
--- a/Library/Homebrew/cmd/update-reset.sh
+++ b/Library/Homebrew/cmd/update-reset.sh
@@ -37,7 +37,7 @@ EOS
     echo
 
     echo "==> Resetting $DIR..."
-    git checkout -B master origin/master
+    git checkout --force -B master origin/master
     echo
   done
 }
-- 
cgit v1.2.3