Junio C Hamano 90b7153806 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

2022-02-16 15:14:29 -08:00

..

add.c

…

am.c

…

annotate.c

…

apply.c

…

archive.c

…

bisect--helper.c

…

blame.c

…

branch.c

…

bugreport.c

…

bundle.c

…

cat-file.c

…

check-attr.c

…

check-ignore.c

…

check-mailmap.c

…

check-ref-format.c

…

checkout--worker.c

…

checkout-index.c

…

checkout.c

Merge branch 'en/remerge-diff'

2022-02-16 15:14:29 -08:00

clean.c

…

clone.c

…

column.c

…

commit-graph.c

…

commit-tree.c

…

commit.c

…

config.c

…

count-objects.c

…

credential-cache--daemon.c

…

credential-cache.c

…

credential-store.c

…

credential.c

…

describe.c

…

diff-files.c

…

diff-index.c

…

diff-tree.c

…

diff.c

…

difftool.c

…

env--helper.c

…

fast-export.c

…

fast-import.c

…

fetch-pack.c

…

fetch.c

Merge branch 'tg/fetch-prune-exit-code-fix'

2022-02-11 16:56:01 -08:00

fmt-merge-msg.c

…

for-each-ref.c

…

for-each-repo.c

…

fsck.c

…

gc.c

…

get-tar-commit-id.c

…

grep.c

…

hash-object.c

…

help.c

…

hook.c

…

index-pack.c

…

init-db.c

…

interpret-trailers.c

…

log.c

Merge branch 'en/remerge-diff'

2022-02-16 15:14:29 -08:00

ls-files.c

…

ls-remote.c

…

ls-tree.c

…

mailinfo.c

…

mailsplit.c

…

merge-base.c

…

merge-file.c

…

merge-index.c

…

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

…

merge.c

…

mktag.c

…

mktree.c

…

multi-pack-index.c

…

mv.c

…

name-rev.c

…

notes.c

…

pack-objects.c

…

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

…

pull.c

…

push.c

…

range-diff.c

…

read-tree.c

…

rebase.c

…

receive-pack.c

…

reflog.c

…

remote-ext.c

…

remote-fd.c

…

remote.c

…

repack.c

…

replace.c

…

rerere.c

…

reset.c

…

rev-list.c

…

rev-parse.c

…

revert.c

…

rm.c

…

send-pack.c

…

shortlog.c

…

show-branch.c

…

show-index.c

…

show-ref.c

…

sparse-checkout.c

…

stash.c

…

stripspace.c

…

submodule--helper.c

…

symbolic-ref.c

…

tag.c

…

unpack-file.c

…

unpack-objects.c

…

update-index.c

…

update-ref.c

…

update-server-info.c

…

upload-archive.c

…

upload-pack.c

…

var.c

…

verify-commit.c

…

verify-pack.c

…

verify-tag.c

…

worktree.c

…

write-tree.c

…