Welcome to
mirror list
, hosted at
ThFree Co
, Russian Federation.
git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
index
:
git.kernel.org/pub/scm/git/git.git
main
maint
master
next
seen
todo
Unnamed repository; edit this file 'description' to name the repository.
root
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
merge-ort.c
Age
Commit message (
Expand
)
Author
2021-02-06
Merge branch 'en/ort-conflict-handling'
Junio C Hamano
2021-01-26
Merge branch 'en/merge-ort-3'
Junio C Hamano
2021-01-04
merge-ort: add handling for different types of files at same path
Elijah Newren
2021-01-04
merge-ort: copy find_first_merges() implementation from merge-recursive.c
Elijah Newren
2021-01-04
merge-ort: implement format_commit()
Elijah Newren
2021-01-04
merge-ort: copy and adapt merge_submodule() from merge-recursive.c
Elijah Newren
2021-01-04
merge-ort: copy and adapt merge_3way() from merge-recursive.c
Elijah Newren
2021-01-04
merge-ort: flesh out implementation of handle_content_merge()
Elijah Newren
2021-01-04
merge-ort: handle book-keeping around two- and three-way content merge
Elijah Newren
2021-01-04
merge-ort: implement unique_path() helper
Elijah Newren
2021-01-04
merge-ort: handle directory/file conflicts that remain
Elijah Newren
2021-01-04
merge-ort: handle D/F conflict where directory disappears due to merge
Elijah Newren
2020-12-17
merge-ort: implement merge_incore_recursive()
Elijah Newren
2020-12-17
merge-ort: make clear_internal_opts() aware of partial clearing
Elijah Newren
2020-12-17
merge-ort: copy a few small helper functions from merge-recursive.c
Elijah Newren
2020-12-16
merge-ort: add implementation of type-changed rename handling
Elijah Newren
2020-12-16
merge-ort: add implementation of normal rename handling
Elijah Newren
2020-12-16
merge-ort: add implementation of rename collisions
Elijah Newren
2020-12-16
merge-ort: add implementation of rename/delete conflicts
Elijah Newren
2020-12-16
merge-ort: add implementation of both sides renaming differently
Elijah Newren
2020-12-16
merge-ort: add implementation of both sides renaming identically
Elijah Newren
2020-12-14
merge-ort: add basic outline for process_renames()
Elijah Newren
2020-12-14
merge-ort: implement compare_pairs() and collect_renames()
Elijah Newren
2020-12-14
merge-ort: implement detect_regular_renames()
Elijah Newren
2020-12-14
merge-ort: add initial outline for basic rename detection
Elijah Newren
2020-12-14
merge-ort: add basic data structures for handling renames
Elijah Newren
2020-12-14
merge-ort: add modify/delete handling and delayed output processing
Elijah Newren
2020-12-14
merge-ort: add die-not-implemented stub handle_content_merge() function
Elijah Newren
2020-12-14
merge-ort: add function grouping comments
Elijah Newren
2020-12-14
merge-ort: add a paths_to_free field to merge_options_internal
Elijah Newren
2020-12-14
merge-ort: add a path_conflict field to merge_options_internal
Elijah Newren
2020-12-14
merge-ort: add a clear_internal_opts helper
Elijah Newren
2020-12-14
merge-ort: add a few includes
Elijah Newren
2020-12-14
merge-ort: free data structures in merge_finalize()
Elijah Newren
2020-12-14
merge-ort: add implementation of record_conflicted_index_entries()
Elijah Newren
2020-12-14
merge-ort: add implementation of checkout()
Elijah Newren
2020-12-14
merge-ort: basic outline for merge_switch_to_result()
Elijah Newren
2020-12-14
merge-ort: step 3 of tree writing -- handling subdirectories as we go
Elijah Newren
2020-12-14
merge-ort: step 2 of tree writing -- function to create tree object
Elijah Newren
2020-12-14
merge-ort: step 1 of tree writing -- record basenames, modes, and oids
Elijah Newren
2020-12-14
merge-ort: have process_entries operate in a defined order
Elijah Newren
2020-12-14
merge-ort: add a preliminary simple process_entries() implementation
Elijah Newren
2020-12-14
merge-ort: avoid recursing into identical trees
Elijah Newren
2020-12-14
merge-ort: record stage and auxiliary info for every path
Elijah Newren
2020-12-14
merge-ort: compute a few more useful fields for collect_merge_info
Elijah Newren
2020-12-14
merge-ort: avoid repeating fill_tree_descriptor() on the same tree
Elijah Newren
2020-12-14
merge-ort: implement a very basic collect_merge_info()
Elijah Newren
2020-12-14
merge-ort: add an err() function similar to one from merge-recursive
Elijah Newren
2020-12-14
merge-ort: use histogram diff
Elijah Newren
2020-12-14
merge-ort: port merge_start() from merge-recursive
Elijah Newren
[next]