merge-ort: add initial outline for basic rename detection

Elijah Newren committed over 5 years ago

merge-ort: add basic data structures for handling renames

Elijah Newren committed over 5 years ago

index-format.txt: document v2 format of file system monitor extension

Jeff Hostetler committed over 5 years ago

docs: multi-pack-index: remove note about future 'verify' work

Johannes Berg committed over 5 years ago

init: provide useful advice about init.defaultBranch

Johannes Schindelin committed over 5 years ago

get_default_branch_name(): prepare for showing some advice

Johannes Schindelin committed over 5 years ago

branch -m: allow renaming a yet-unborn branch

Johannes Schindelin committed over 5 years ago

init: document `init.defaultBranch` better

Johannes Schindelin committed over 5 years ago

merge-ort: add modify/delete handling and delayed output processing

Elijah Newren committed over 5 years ago

merge-ort: add die-not-implemented stub handle_content_merge() function

Elijah Newren committed over 5 years ago

merge-ort: add function grouping comments

Elijah Newren committed over 5 years ago

merge-ort: add a paths_to_free field to merge_options_internal

Elijah Newren committed over 5 years ago

merge-ort: add a path_conflict field to merge_options_internal

Elijah Newren committed over 5 years ago

merge-ort: add a clear_internal_opts helper

Elijah Newren committed over 5 years ago

merge-ort: add a few includes

Elijah Newren committed over 5 years ago

merge-ort: free data structures in merge_finalize()

Elijah Newren committed over 5 years ago

merge-ort: add implementation of record_conflicted_index_entries()

Elijah Newren committed over 5 years ago

tree: enable cmp_cache_name_compare() to be used elsewhere

Elijah Newren committed over 5 years ago

merge-ort: add implementation of checkout()

Elijah Newren committed over 5 years ago

merge-ort: basic outline for merge_switch_to_result()

Elijah Newren committed over 5 years ago