Added option to use author time instead of commit time

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"

src/cli.rs

@@ -48,6 +48,13 @@ 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("use-author-time"), default_value_t = false)]
+	pub use_author_time: bool,
+
 	#[arg(long("counting"), value_enum, default_value_t = ColorLogic::ByWeight)]
 	pub counting: ColorLogic,
 

src/lib.rs

@@ -180,6 +180,7 @@ pub fn get_commits(
 			});
 
 		let repo = repo.to_thread_local();
+		let mut cached_commits: Vec<Commit> = vec![];
 
 		let branch_commits = branch_commits
 			.into_iter()
@@ -204,9 +205,30 @@ 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 = if args.use_author_time {
+					author.time().ok()?
+				}
+				else {
+					c.time().ok()?
+				};
+				let time =
+					DateTime::from_timestamp_millis(time.seconds * 1000)?.with_timezone(&Local);
+				if time < start_date || time > end_date {
+					return None;
+				}
+
 				let author = Author { name, email };
 				let author = mailmap.resolve(author);
 
@@ -214,20 +236,28 @@ pub fn get_commits(
 					return None;
 				}
 
-				let time = c.time().ok()?;
+				let commit = Commit {
-				let time =
-					DateTime::from_timestamp_millis(time.seconds * 1000)?.with_timezone(&Local);
-				if time < start_date || time > end_date {
-					return None;
-				}
-
-				Some(Commit {
 					id: c.id,
 					title,
 					author,
 					repo: repo_name.to_string(),
 					time,
-				})
+				};
+
+				if args.use_author_time {
+					for other in &cached_commits {
+						if other.author == commit.author
+							&& other.title == commit.title
+							&& other.time == commit.time
+						{
+							return None;
+						}
+					}
+
+					cached_commits.push(commit.clone());
+				}
+
+				Some(commit)
 			})
 			.collect_vec();