 Junio C Hamano
|
4339259d5f
Merge branch 'en/eol-attrs-gotchas'
|
%!s(int64=5) %!d(string=hai) anos |
 Elijah Newren
|
8d552258f4
merge: make merge.renormalize work for all uses of merge machinery
|
%!s(int64=5) %!d(string=hai) anos |
|
Elijah Newren
|
56e743426b
merge-recursive: fix unclear and outright wrong comments
|
%!s(int64=5) %!d(string=hai) anos |
|
Elijah Newren
|
95983da6b4
merge-recursive: fix rename/rename(1to2) for working tree with a binary
|
%!s(int64=5) %!d(string=hai) anos |
 brian m. carlson
|
ab90ecae99
convert: permit passing additional metadata to filter processes
|
%!s(int64=5) %!d(string=hai) anos |
|
Junio C Hamano
|
d1075adfdf
Merge branch 'en/merge-path-collision'
|
%!s(int64=5) %!d(string=hai) anos |
|
Junio C Hamano
|
48d5f25ddd
Merge branch 'en/t3433-rebase-stat-dirty-failure'
|
%!s(int64=5) %!d(string=hai) anos |
|
Elijah Newren
|
802050400a
merge-recursive: apply collision handling unification to recursive case
|
%!s(int64=5) %!d(string=hai) anos |
|
Elijah Newren
|
fb1c18fc46
merge-recursive: fix the refresh logic in update_file_flags
|
%!s(int64=5) %!d(string=hai) anos |
|
Junio C Hamano
|
4c616c2ba1
merge-recursive: use subtraction to flip stage
|
%!s(int64=5) %!d(string=hai) anos |
 Jeff King
|
ee798742bd
merge-recursive: silence -Wxor-used-as-pow warning
|
%!s(int64=5) %!d(string=hai) anos |
|
Junio C Hamano
|
f25f04edca
Merge branch 'en/merge-recursive-oid-eq-simplify'
|
%!s(int64=5) %!d(string=hai) anos |
|
Elijah Newren
|
763a59e71c
merge-recursive: remove unnecessary oid_eq function
|
%!s(int64=5) %!d(string=hai) anos |
|
Junio C Hamano
|
d9800351d3
Merge branch 'en/merge-recursive-directory-rename-fixes'
|
%!s(int64=5) %!d(string=hai) anos |
|
Elijah Newren
|
49b8133a9e
merge-recursive: fix merging a subdirectory into the root directory
|
%!s(int64=5) %!d(string=hai) anos |
|
Elijah Newren
|
d3eebaad5e
merge-recursive: clean up get_renamed_dir_portion()
|
%!s(int64=5) %!d(string=hai) anos |
|
Junio C Hamano
|
5efabc7ed9
Merge branch 'ew/hashmap'
|
%!s(int64=5) %!d(string=hai) anos |
|
Junio C Hamano
|
280bd44551
Merge branch 'en/merge-recursive-cleanup'
|
%!s(int64=5) %!d(string=hai) anos |
|
Elijah Newren
|
b657047719
merge-recursive: fix the fix to the diff3 common ancestor label
|
%!s(int64=5) %!d(string=hai) anos |
 Eric Wong
|
404ab78e39
hashmap: remove type arg from hashmap_{get,put,remove}_entry
|
%!s(int64=5) %!d(string=hai) anos |
|
Eric Wong
|
23dee69f53
OFFSETOF_VAR macro to simplify hashmap iterators
|
%!s(int64=5) %!d(string=hai) anos |
|
Eric Wong
|
c8e424c9c9
hashmap: introduce hashmap_free_entries
|
%!s(int64=5) %!d(string=hai) anos |
|
Eric Wong
|
87571c3f71
hashmap: use *_entry APIs for iteration
|
%!s(int64=5) %!d(string=hai) anos |
|
Eric Wong
|
939af16eac
hashmap_cmp_fn takes hashmap_entry params
|
%!s(int64=5) %!d(string=hai) anos |
|
Eric Wong
|
f23a465132
hashmap_get{,_from_hash} return "struct hashmap_entry *"
|
%!s(int64=5) %!d(string=hai) anos |
|
Eric Wong
|
26b455f21e
hashmap_put takes "struct hashmap_entry *"
|
%!s(int64=5) %!d(string=hai) anos |
|
Eric Wong
|
28ee794128
hashmap_remove takes "const struct hashmap_entry *"
|
%!s(int64=5) %!d(string=hai) anos |
|
Eric Wong
|
b6c5241606
hashmap_get takes "const struct hashmap_entry *"
|
%!s(int64=5) %!d(string=hai) anos |
|
Eric Wong
|
b94e5c1df6
hashmap_add takes "struct hashmap_entry *"
|
%!s(int64=5) %!d(string=hai) anos |
|
Eric Wong
|
d22245a2e3
hashmap_entry_init takes "struct hashmap_entry *"
|
%!s(int64=5) %!d(string=hai) anos |
