implement pull request parsing

lib/github_changelog_generator/generator.rb

@@ -8,7 +8,7 @@ module GitHubChangelogGenerator
     def get_string_for_pull_request(pull_request)
       encapsulated_title = self.encapsulate_string pull_request[:title]
 
-      merge = "#{@options[:merge_prefix]}#{encapsulated_title} [\\##{pull_request[:number]}](#{pull_request.html_url})"
+      merge = "#{encapsulated_title} [\\##{pull_request[:number]}](#{pull_request.html_url})"
       if @options[:author]
         if pull_request.user.nil?
           merge += " ({Null user})\n\n"

lib/github_changelog_generator/parser.rb

@@ -7,7 +7,7 @@ module GitHubChangelogGenerator
   class Parser
     def self.parse_options
       # :include_labels => %w(bug enhancement),
-      options = {:tag1 => nil, :tag2 => nil, :format => '%Y-%m-%d', :output => 'CHANGELOG.md', :exclude_labels => %w(duplicate question invalid wontfix), :pulls => true, :issues => true, :verbose => true, :add_issues_wo_labels => true, :add_pr_wo_labels => true, :merge_prefix => '*Merged pull-request:* ', :author => true, :filter_issues_by_milestone => true, :compare_link => true, :unreleased => true}
+      options = {:tag1 => nil, :tag2 => nil, :format => '%Y-%m-%d', :output => 'CHANGELOG.md', :exclude_labels => %w(duplicate question invalid wontfix), :pulls => true, :issues => true, :verbose => true, :add_issues_wo_labels => true, :add_pr_wo_labels => true, :merge_prefix => '*Merged pull requests:* ', :author => true, :filter_issues_by_milestone => true, :compare_link => true, :unreleased => true}
 
       parser = OptionParser.new { |opts|
         opts.banner = 'Usage: changelog_generator [options]'
@@ -65,6 +65,9 @@ module GitHubChangelogGenerator
         opts.on('--github-api [URL]', 'The enterprise endpoint to use for your Github API.') do |last|
           options[:github_endpoint] = last
         end
+        opts.on('--simple-list', 'Create simple list from issues and pull requests. Default is false.') do |v|
+          options[:simple_list] = v
+        end
         opts.on('--[no-]verbose', 'Run verbosely. Default is true') do |v|
           options[:verbose] = v
         end