Added a test option for ignoring commits with different commit / author times

Cargo.lock

@@ -449,7 +449,7 @@ dependencies = [
 
 [[package]]
 name = "git-heatmap"
-version = "1.4.1"
+version = "1.4.2"
 dependencies = [
  "anyhow",
  "chrono",

Cargo.toml

@@ -2,7 +2,7 @@ cargo-features = ["codegen-backend"]
 
 [package]
 name = "git-heatmap"
-version = "1.4.1"
+version = "1.4.2"
 edition = "2024"
 authors = ["Wynd <wyndftw@proton.me>"]
 description = "A simple and customizable heatmap for git repos"
@@ -52,4 +52,4 @@ incremental = true
 opt-level = 3
 strip = true
 lto = true
-codegen-units = 1
+codegen-units = 1

src/cli.rs

@@ -48,6 +48,10 @@ pub struct CliArgs {
 	#[arg(long("no-merges"), default_value_t = false)]
 	pub no_merges: bool,
 
+	// Experimental
+	#[arg(long("no-diff"), default_value_t = false)]
+	pub no_diff: bool,
+
 	#[arg(long("counting"), value_enum, default_value_t = ColorLogic::ByWeight)]
 	pub counting: ColorLogic,
 

src/lib.rs

@@ -204,8 +204,18 @@ pub fn get_commits(
 
 				let author = c.author().ok()?;
 
+				// Ignores commits with different commit / author times
+				// Usually due to rebases or cherry picking, however other edge cases may apply too
+				if args.no_diff {
+					let commit_info = c.committer().unwrap();
+					if commit_info.time != author.time {
+						return None;
+					}
+				}
+
 				let email = author.email.to_string();
 				let name = author.name.to_string();
+				// let time = author.time().unwrap();
 
 				let author = Author { name, email };
 				let author = mailmap.resolve(author);