git.rb in waddup-0.1.0

- old
+ new

@@ -60,15 +60,15 @@
     #   :repo (path)
     #
     def events_for_repo(from, to, repo)
       repo_label = self.class.label_for_repo repo
 
-      results = run "git --git-dir='#{repo}' log --author='#{author}' --since='#{from.iso8601}' --until='#{to.iso8601}' --format='format:#{GIT_FORMAT}'"
+      results = run "git --git-dir='#{repo}' log --all --no-merges --author='#{author}' --since='#{from.iso8601}' --until='#{to.iso8601}' --format='format:#{GIT_FORMAT}'"
       results.scan(EXTRACT_PATTERN).map do |hash, datetime, subject|
         Waddup::Event.new do |e|
           e.label  = "[#{repo_label}] #{subject}"
-          e.at     = DateTime.parse(datetime)
+          e.at     = Time.parse(datetime)
           e.source = self
         end
       end
     end
 
@@ -87,10 +87,10 @@
       parent.basename.to_s
     end
 
     # Requires Git to be installed successfully
     def self.usable?
-      run 'git --version', :quietly => true
+      run 'git --version', quietly: true
       $?.success?
     end
 
   end
 