diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb
index 4f971791cb5b671274c9a78b9bc2a9f95c35f283..743c94fa59c3c53c144fe194d1da80b1774a5e10 100644
--- a/Library/Homebrew/cmd/doctor.rb
+++ b/Library/Homebrew/cmd/doctor.rb
@@ -749,6 +749,13 @@ def check_missing_deps
   end
 end
 
+def check_git_status
+  if system "/usr/bin/which -s git" and not `git status -s #{HOMEBREW_PREFIX}/Library/Homebrew`.empty?
+    ohai "You have uncommitted modifications to Homebrew core"
+    puts "Unless you know what you are doing, you should: git reset --hard"
+  end
+end
+
 module Homebrew extend self
   def doctor
     old_stdout = $stdout
@@ -791,6 +798,7 @@ module Homebrew extend self
       check_for_other_frameworks
       check_tmpdir
       check_missing_deps
+      check_git_status
     ensure
       $stdout = old_stdout
     end