Add --no-merges flag for total commit count

Addresses #131

Author: spenserblack

Diff for: src/info.rs

@@ -88,7 +88,7 @@ impl std::fmt::Display for Info {
                         iter.collect()
                     }
                 };
-                
+
                 for (cnt, language) in languages.iter().enumerate() {
                     let formatted_number = format!("{:.*}", 2, language.1);
                     if cnt != 0 && cnt % 3 == 0 {
@@ -223,14 +223,15 @@ impl Info {
         colors: Vec<String>,
         disabled: InfoFieldOn,
         bold_flag: bool,
-        custom_image: Option<DynamicImage>
+        custom_image: Option<DynamicImage>,
+        no_merges: bool,
     ) -> Result<Info> {
         let authors = Info::get_authors(&dir, 3);
         let (git_v, git_user) = Info::get_git_info(&dir);
         let current_commit_info = Info::get_current_commit_info(&dir)?;
         let config = Info::get_configuration(&dir)?;
         let version = Info::get_version(&dir)?;
-        let commits = Info::get_commits(&dir)?;
+        let commits = Info::get_commits(&dir, no_merges)?;
         let repo_size = Info::get_packed_size(&dir)?;
         let last_change = Info::get_last_change(&dir)?;
         let creation_date = Info::get_creation_time(dir)?;
@@ -407,13 +408,15 @@ impl Info {
         }
     }
 
-    fn get_commits(dir: &str) -> Result<String> {
+    fn get_commits(dir: &str, no_merges: bool) -> Result<String> {
+        let mut args = vec!["-C", dir, "rev-list", "--count"];
+        if no_merges {
+            args.push("--no-merges");
+        }
+        args.push("HEAD");
+
         let output = Command::new("git")
-            .arg("-C")
-            .arg(dir)
-            .arg("rev-list")
-            .arg("--count")
-            .arg("HEAD")
+            .args(args)
             .output()
             .expect("Failed to execute git.");
 

Diff for: src/main.rs

@@ -176,6 +176,10 @@ Possible values: [{0}{1}{2}{3}{4}{5}{6}{7}{8}{9}{10}{11}{12}{13}{14}{15}]",
                 .long("image")
                 .takes_value(true)
                 .help("Sets a custom image to use instead of the ascii logo"),
+        ).arg(
+            Arg::with_name("no-merges")
+                .long("no-merges")
+                .help("Prevents merge commits from being counted"),
         )
         .get_matches();
 
@@ -237,7 +241,17 @@ Possible values: [{0}{1}{2}{3}{4}{5}{6}{7}{8}{9}{10}{11}{12}{13}{14}{15}]",
         None
     };
 
-    let info = Info::new(&dir, custom_logo, custom_colors, disable_fields, bold_flag, custom_image)?;
+    let no_merges = matches.is_present("no-merges");
+
+    let info = Info::new(
+        &dir,
+        custom_logo,
+        custom_colors,
+        disable_fields,
+        bold_flag,
+        custom_image,
+        no_merges,
+    )?;
 
     print!("{}", info);
     Ok(())
@@ -255,4 +269,4 @@ fn is_git_installed() -> bool {
 struct Configuration {
     pub repository_name: String,
     pub repository_url: String,
-}
+}