projects
/
git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
merge-ort: implement format_commit()
[git]
/
merge-ort.c
2021-01-04
Elijah Newren
merge-ort: implement format_commit()
blob
|
commitdiff
|
raw
2021-01-04
Elijah Newren
merge-ort: copy and adapt merge_submodule() from merge...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-04
Elijah Newren
merge-ort: copy and adapt merge_3way() from merge-recur...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-04
Elijah Newren
merge-ort: flesh out implementation of handle_content_m...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-04
Elijah Newren
merge-ort: handle book-keeping around two- and three...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-04
Elijah Newren
merge-ort: implement unique_path() helper
blob
|
commitdiff
|
raw
|
diff to current
2021-01-04
Elijah Newren
merge-ort: handle directory/file conflicts that remain
blob
|
commitdiff
|
raw
|
diff to current
2021-01-04
Elijah Newren
merge-ort: handle D/F conflict where directory disappea...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: add modify/delete handling and delayed outpu...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: add die-not-implemented stub handle_content_...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: add function grouping comments
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: add a paths_to_free field to merge_options_i...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: add a path_conflict field to merge_options_i...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: add a clear_internal_opts helper
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: add a few includes
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: free data structures in merge_finalize()
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: add implementation of record_conflicted_inde...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: add implementation of checkout()
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: basic outline for merge_switch_to_result()
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: step 3 of tree writing -- handling subdirect...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: step 2 of tree writing -- function to create...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: step 1 of tree writing -- record basenames...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: have process_entries operate in a defined...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: add a preliminary simple process_entries...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: avoid recursing into identical trees
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: record stage and auxiliary info for every...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: compute a few more useful fields for collect...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: avoid repeating fill_tree_descriptor() on...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: implement a very basic collect_merge_info()
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: add an err() function similar to one from...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: use histogram diff
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: port merge_start() from merge-recursive
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: add some high-level algorithm structure
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: setup basic internal data structures
blob
|
commitdiff
|
raw
|
diff to current
2020-11-11
Junio C Hamano
Merge branch 'en/strmap' into en/merge-ort-impl
blob
|
commitdiff
|
raw
|
diff to current
2020-10-27
Elijah Newren
merge-ort: barebones API of new merge strategy with...
blob
|
commitdiff
|
raw
|
diff to current
projects / git / history
Elijah Newren
Junio C Hamano