allow merge to pass along arguments. in my case, --squash

TJ Biddle · TJ Biddle · commit a8de13e19446 · 2012-09-18T19:27:43.000-07:00
diff --git a/lib/git/base.rb b/lib/git/base.rb
@@ -310,8 +310,8 @@ def push(remote = 'origin', branch = 'master', tags = false)
     # merges one or more branches into the current working branch
     #
     # you can specify more than one branch to merge by passing an array of branches
-    def merge(branch, message = 'merge')
-      self.lib.merge(branch, message)
+    def merge(branch, message = 'merge', arr = [])
+      self.lib.merge(branch, message, arr)
     end
 
     # iterates over the files which are unmerged
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -499,8 +499,7 @@ def checkout_file(version, file)
       command('checkout', arr_opts)
     end
     
-    def merge(branch, message = nil)      
-      arr_opts = []
+    def merge(branch, message = nil, arr_opts = [])
       arr_opts << '-m' << message if message
       arr_opts += [branch]
       command('merge', arr_opts)
