From c911b4b998992a69b5eea167658fb00c52a064a1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 8 Jun 2010 14:46:54 -0400 Subject: [PATCH] response --- doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn b/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn index 5d5b9fc23..6abe203a3 100644 --- a/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn +++ b/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn @@ -178,3 +178,12 @@ done instead of the timestamp when the commit was done. Is this intentional? Otherwise I could supply a patch. --[[tschwinge]] + +> In order to be nice and fast, the git backend runs git log once +> and records data for all files. Rather than looking at the log for a +> given file. So amoung other things, it does not follow renames. +> +> AFAICS, git log only shows merges modifying files if it was a conflicted +> merge. As the file is then actually modified to resolve the merge +> I think it makes sense to count the merge as the last modification in +> that case. --[[Joey]]