summaryrefslogtreecommitdiff
path: root/doc/bugs
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-06-08 14:46:54 -0400
committerJoey Hess <joey@kitenet.net>2010-06-08 14:46:54 -0400
commitc911b4b998992a69b5eea167658fb00c52a064a1 (patch)
tree8110d1c936a7638a113e8ec092b833a4670ff96b /doc/bugs
parent2be6660a8f3f523905e7c0ba4c36f579ed0d2493 (diff)
response
Diffstat (limited to 'doc/bugs')
-rw-r--r--doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn9
1 files changed, 9 insertions, 0 deletions
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]]