diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-07-15 01:03:58 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-07-15 01:03:59 +0300 |
commit | be733e120016a076926da3491c0c77d439686933 (patch) | |
tree | 145936569e2b3808f02ddd747d5415b68a5856fe /object-file.c | |
parent | dc6315e1fc1d5c0d7afd3fe20cf192bd4c484930 (diff) | |
parent | 7260e87248e743b197d34c1caf3949ae4fa3bc12 (diff) |
Merge branch 'en/merge-tree'
"git merge-tree" learned a new mode where it takes two commits and
computes a tree that would result in the merge commit, if the
histories leading to these two commits were to be merged.
* en/merge-tree:
git-merge-tree.txt: add a section on potentional usage mistakes
merge-tree: add a --allow-unrelated-histories flag
merge-tree: allow `ls-files -u` style info to be NUL terminated
merge-ort: optionally produce machine-readable output
merge-ort: store more specific conflict information
merge-ort: make `path_messages` a strmap to a string_list
merge-ort: store messages in a list, not in a single strbuf
merge-tree: provide easy access to `ls-files -u` style info
merge-tree: provide a list of which files have conflicts
merge-ort: remove command-line-centric submodule message from merge-ort
merge-ort: provide a merge_get_conflicted_files() helper function
merge-tree: support including merge messages in output
merge-ort: split out a separate display_update_messages() function
merge-tree: implement real merges
merge-tree: add option parsing and initial shell for real merge function
merge-tree: move logic for existing merge into new function
merge-tree: rename merge_trees() to trivial_merge_trees()
Diffstat (limited to 'object-file.c')
0 files changed, 0 insertions, 0 deletions