diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2022-02-16 15:14:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-16 15:14:29 -0800 |
| commit | 90b7153806af46ca62b85a92a2810015be2453d4 (patch) | |
| tree | d901ce92dd17d06fe7d0728dd1c25f29d4b37e98 /blame.c | |
| parent | Merge branch 'hn/reftable-coverity-fixes' (diff) | |
| parent | diff-merges: avoid history simplifications when diffing merges (diff) | |
| download | tgif-90b7153806af46ca62b85a92a2810015be2453d4.tar.xz | |
Merge branch 'en/remerge-diff'
"git log --remerge-diff" shows the difference from mechanical merge
result and the result that is actually recorded in a merge commit.
* en/remerge-diff:
diff-merges: avoid history simplifications when diffing merges
merge-ort: mark conflict/warning messages from inner merges as omittable
show, log: include conflict/warning messages in --remerge-diff headers
diff: add ability to insert additional headers for paths
merge-ort: format messages slightly different for use in headers
merge-ort: mark a few more conflict messages as omittable
merge-ort: capture and print ll-merge warnings in our preferred fashion
ll-merge: make callers responsible for showing warnings
log: clean unneeded objects during `log --remerge-diff`
show, log: provide a --remerge-diff capability
Diffstat (limited to 'blame.c')
0 files changed, 0 insertions, 0 deletions