diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-10 10:30:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-10 10:50:53 (GMT) |
| commit | d416df8869d803282fb254a18505eccceee9ba3e (patch) | |
| tree | eb6dd0625cfe87cce31e9d7d8c6c7cd128dc4dcd /server-info.c | |
| parent | 297a1aadbe22c978dca60d6512e5c851ebc6688c (diff) | |
| download | git-d416df8869d803282fb254a18505eccceee9ba3e.zip git-d416df8869d803282fb254a18505eccceee9ba3e.tar.gz git-d416df8869d803282fb254a18505eccceee9ba3e.tar.bz2 | |
combine-diff: Record diff status a bit more faithfully
This shows "new file mode XXXX" and "deleted file mode XXXX"
lines like two-way diff-patch output does, by checking the
status from each parent.
The diff-raw output for combined diff is made a bit uglier by
showing diff status letters with each parent. While most of the
case you would see "MM" in the output, an Evil Merge that
touches a path that was added by inheriting from one parent is
possible and it would be shown like these:
$ git-diff-tree --abbrev -c HEAD
2d7ca89675eb8888b0b88a91102f096d4471f09f
::000000 000000 100644 0000000... 0000000... 31dd686... AA b
::000000 100644 100644 0000000... 6c884ae... c6d4fa8... AM d
::100644 100644 100644 4f7cbe7... f8c295c... 19d5d80... RR e
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'server-info.c')
0 files changed, 0 insertions, 0 deletions