urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clarification

master
Joey Hess 2010-06-09 13:42:13 -04:00
parent 4eb82e7d41
commit 0da7b1a9c3
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn
View File

@ -191,6 +191,15 @@ intentional? Otherwise I could supply a patch.
>> That'd be reasonable, but `git log` will also show merges that are not
>> conflicting (as in my case).
>>> Actually when displaying a merge, `git log --stat` only lists files that
>>> were actually modified in a new way as part of the merge resolution.
>>> Ie, if the merge resolution only joins together some of the parent
>>> hunks, the file is not listed as having been modified.
>>>
>>> So, no, ikiwiki's use of git log will not show files modified in
>>> non-conflicting merges.
>>> --[[Joey]]
>> Yet, I'm not totally disagreeing with your choice. With this `git
>> log` invocation, you're not able to tell from its output whether a
>> conflict was resolved or not.