diff --git a/Library/Homebrew/build.rb b/Library/Homebrew/build.rb
index 5d1fc4dad1..9072d5e3ed 100644
--- a/Library/Homebrew/build.rb
+++ b/Library/Homebrew/build.rb
@@ -122,7 +122,7 @@ class Build
         staging.retain! if ARGV.keep_tmp?
         formula.patch
 
-        if ARGV.git?
+        if Homebrew.args.git?
           system "git", "init"
           system "git", "add", "-A"
         end
@@ -131,7 +131,7 @@ class Build
           puts "Type `exit` to return and finalize the installation."
           puts "Install to this prefix: #{formula.prefix}"
 
-          if ARGV.git?
+          if Homebrew.args.git?
             puts "This directory is now a git repo. Make your changes and then use:"
             puts "  git diff | pbcopy"
             puts "to copy the diff to the clipboard."
diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb
index dab3ccfa8b..adf545f7fb 100644
--- a/Library/Homebrew/extend/ARGV.rb
+++ b/Library/Homebrew/extend/ARGV.rb
@@ -35,10 +35,6 @@ module HomebrewArgvExtension
     include? "--keep-tmp"
   end
 
-  def git?
-    flag? "--git"
-  end
-
   def homebrew_developer?
     !ENV["HOMEBREW_DEVELOPER"].nil?
   end
diff --git a/Library/Homebrew/reinstall.rb b/Library/Homebrew/reinstall.rb
index bbc41a7fa5..c96960d166 100644
--- a/Library/Homebrew/reinstall.rb
+++ b/Library/Homebrew/reinstall.rb
@@ -27,7 +27,7 @@ module Homebrew
     fi.options              = options
     fi.build_bottle         = ARGV.build_bottle?
     fi.interactive          = Homebrew.args.interactive?
-    fi.git                  = ARGV.git?
+    fi.git                  = Homebrew.args.git?
     fi.link_keg           ||= keg_was_linked if keg_had_linked_opt
     fi.build_from_source    = true if build_from_source
     if tab