index
:
tgif.git
2.36
Terin's Improved Git Fork
terinjokes@gmail.com
summary
refs
log
tree
commit
diff
log msg
author
committer
range
Age
Commit message (
Expand
)
Author
Files
Lines
2021-01-04
merge-ort: handle directory/file conflicts that remain
Elijah Newren
1
-2
/
+84
2021-01-04
merge-ort: handle D/F conflict where directory disappears due to merge
Elijah Newren
1
-1
/
+22
2020-12-13
merge-ort: add modify/delete handling and delayed output processing
Elijah Newren
1
-2
/
+98
2020-12-13
merge-ort: add die-not-implemented stub handle_content_merge() function
Elijah Newren
1
-0
/
+14
2020-12-13
merge-ort: add function grouping comments
Elijah Newren
1
-0
/
+21
2020-12-13
merge-ort: add a paths_to_free field to merge_options_internal
Elijah Newren
1
-1
/
+25
2020-12-13
merge-ort: add a path_conflict field to merge_options_internal
Elijah Newren
1
-0
/
+7
2020-12-13
merge-ort: add a clear_internal_opts helper
Elijah Newren
1
-16
/
+24
2020-12-13
merge-ort: add a few includes
Elijah Newren
1
-0
/
+2
2020-12-13
merge-ort: free data structures in merge_finalize()
Elijah Newren
1
-1
/
+31
2020-12-13
merge-ort: add implementation of record_conflicted_index_entries()
Elijah Newren
1
-1
/
+87
2020-12-13
tree: enable cmp_cache_name_compare() to be used elsewhere
Elijah Newren
2
-1
/
+3
2020-12-13
merge-ort: add implementation of checkout()
Elijah Newren
1
-1
/
+44
2020-12-13
merge-ort: basic outline for merge_switch_to_result()
Elijah Newren
1
-1
/
+41
2020-12-13
merge-ort: step 3 of tree writing -- handling subdirectories as we go
Elijah Newren
1
-8
/
+234
2020-12-13
merge-ort: step 2 of tree writing -- function to create tree object
Elijah Newren
1
-1
/
+66
2020-12-13
merge-ort: step 1 of tree writing -- record basenames, modes, and oids
Elijah Newren
1
-3
/
+37
2020-12-13
merge-ort: have process_entries operate in a defined order
Elijah Newren
1
-3
/
+50
2020-12-13
merge-ort: add a preliminary simple process_entries() implementation
Elijah Newren
1
-1
/
+102
2020-12-13
merge-ort: avoid recursing into identical trees
Elijah Newren
1
-0
/
+13
2020-12-13
merge-ort: record stage and auxiliary info for every path
Elijah Newren
1
-7
/
+90
2020-12-13
merge-ort: compute a few more useful fields for collect_merge_info
Elijah Newren
1
-0
/
+36
2020-12-13
merge-ort: avoid repeating fill_tree_descriptor() on the same tree
Elijah Newren
1
-4
/
+22
2020-12-13
merge-ort: implement a very basic collect_merge_info()
Elijah Newren
1
-1
/
+134
2020-12-13
merge-ort: add an err() function similar to one from merge-recursive
Elijah Newren
2
-3
/
+37
2020-12-13
merge-ort: use histogram diff
Elijah Newren
1
-0
/
+4
2020-12-13
merge-ort: port merge_start() from merge-recursive
Elijah Newren
1
-1
/
+44
2020-12-13
merge-ort: add some high-level algorithm structure
Elijah Newren
1
-1
/
+67
2020-12-13
merge-ort: setup basic internal data structures
Elijah Newren
1
-0
/
+147
2020-11-11
Merge branch 'en/strmap' into en/merge-ort-impl
Junio C Hamano
27
-170
/
+621
2020-11-11
shortlog: use strset from strmap.h
Elijah Newren
1
-57
/
+4
2020-11-11
Use new HASHMAP_INIT macro to simplify hashmap initialization
Elijah Newren
6
-38
/
+16
2020-11-11
strmap: take advantage of FLEXPTR_ALLOC_STR when relevant
Elijah Newren
2
-16
/
+20
2020-11-11
strmap: enable allocations to come from a mem_pool
Elijah Newren
2
-12
/
+30
2020-11-06
strmap: add a strset sub-type
Elijah Newren
2
-0
/
+80
2020-11-06
strmap: split create_entry() out of strmap_put()
Elijah Newren
1
-14
/
+23
2020-11-04
strmap: add functions facilitating use as a string->int map
Elijah Newren
2
-0
/
+105
2020-11-04
strmap: enable faster clearing and reusing of strmaps
Elijah Newren
2
-0
/
+12
2020-11-04
strmap: add more utility functions
Elijah Newren
2
-0
/
+54
2020-11-02
merge,rebase,revert: select ort or recursive by config or environment
Elijah Newren
5
-15
/
+104
2020-11-02
strmap: new utility functions
Elijah Newren
3
-0
/
+165
2020-11-02
hashmap: provide deallocation function names
Elijah Newren
22
-53
/
+63
2020-11-02
hashmap: introduce a new hashmap_partial_clear()
Elijah Newren
2
-13
/
+39
2020-11-02
hashmap: allow re-use after hashmap_free()
Elijah Newren
2
-2
/
+17
2020-11-02
hashmap: adjust spacing to fix argument alignment
Elijah Newren
2
-19
/
+20
2020-10-29
fast-rebase: demonstrate merge-ort's API via new test-tool command
Elijah Newren
4
-0
/
+214
2020-10-26
merge-ort-wrappers: new convience wrappers to mimic the old merge API
Elijah Newren
3
-0
/
+88
2020-10-26
merge-ort: barebones API of new merge strategy with empty implementation
Elijah Newren
3
-0
/
+111
2020-10-22
Sync with Git 2.29.1
Junio C Hamano
4
-11
/
+19
2020-10-22
Git 2.29.1
Junio C Hamano
3
-2
/
+13
[next]