diff options
| author | Joey Hess <joey@kitenet.net> | 2010-06-09 13:42:13 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-06-09 13:42:13 -0400 |
| commit | 0da7b1a9c33b3ff67fade15c395672f02bfe6a45 (patch) | |
| tree | 36698fb510b61f34777049d47f9e48a0896854c3 /doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn | |
| parent | 4eb82e7d4161114c6a2194f8f887629ab86162c8 (diff) | |
| download | ikiwiki-0da7b1a9c33b3ff67fade15c395672f02bfe6a45.tar ikiwiki-0da7b1a9c33b3ff67fade15c395672f02bfe6a45.tar.gz | |
clarification
Diffstat (limited to 'doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn')
| -rw-r--r-- | doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn | 9 |
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 4ce7cc3df..164e62075 100644 --- a/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn +++ b/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn @@ -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. |