Google Git
Sign in
googlers / jrn / git / fe299ec5ae7b419990bbc3efd4e6bfa3f0773b45 / merge-recursive.c
  1. d1075ad Merge branch 'en/merge-path-collision' by Junio C Hamano · 5 years ago
  2. 48d5f25 Merge branch 'en/t3433-rebase-stat-dirty-failure' by Junio C Hamano · 5 years ago
  3. 8020504 merge-recursive: apply collision handling unification to recursive case by Elijah Newren · 5 years ago
  4. fb1c18f merge-recursive: fix the refresh logic in update_file_flags by Elijah Newren · 5 years ago
  5. 4c616c2 merge-recursive: use subtraction to flip stage by Junio C Hamano · 5 years ago
  6. ee79874 merge-recursive: silence -Wxor-used-as-pow warning by Jeff King · 5 years ago
  7. f25f04e Merge branch 'en/merge-recursive-oid-eq-simplify' by Junio C Hamano · 5 years ago
  8. 763a59e merge-recursive: remove unnecessary oid_eq function by Elijah Newren · 5 years ago
  9. d980035 Merge branch 'en/merge-recursive-directory-rename-fixes' by Junio C Hamano · 5 years ago
  10. 49b8133a merge-recursive: fix merging a subdirectory into the root directory by Elijah Newren · 5 years ago
  11. d3eebaa merge-recursive: clean up get_renamed_dir_portion() by Elijah Newren · 5 years ago
  12. 5efabc7 Merge branch 'ew/hashmap' by Junio C Hamano · 5 years ago
  13. 280bd44 Merge branch 'en/merge-recursive-cleanup' by Junio C Hamano · 5 years ago
  14. b657047 merge-recursive: fix the fix to the diff3 common ancestor label by Elijah Newren · 5 years ago
  15. 404ab78 hashmap: remove type arg from hashmap_{get,put,remove}_entry by Eric Wong · 5 years ago
  16. 23dee69 OFFSETOF_VAR macro to simplify hashmap iterators by Eric Wong · 5 years ago
  17. c8e424c hashmap: introduce hashmap_free_entries by Eric Wong · 5 years ago
  18. 87571c3 hashmap: use *_entry APIs for iteration by Eric Wong · 5 years ago
  19. 939af16 hashmap_cmp_fn takes hashmap_entry params by Eric Wong · 5 years ago
  20. f23a465 hashmap_get{,_from_hash} return "struct hashmap_entry *" by Eric Wong · 5 years ago
  21. 26b455f hashmap_put takes "struct hashmap_entry *" by Eric Wong · 5 years ago
  22. 28ee794 hashmap_remove takes "const struct hashmap_entry *" by Eric Wong · 5 years ago
  23. b6c5241 hashmap_get takes "const struct hashmap_entry *" by Eric Wong · 5 years ago
  24. b94e5c1 hashmap_add takes "struct hashmap_entry *" by Eric Wong · 5 years ago
  25. d22245a hashmap_entry_init takes "struct hashmap_entry *" by Eric Wong · 5 years ago
  26. 8e4ec33 merge-recursive: fix the diff3 common ancestor label for virtual commits by Elijah Newren · 5 years ago
  27. 83e3ad3 merge-recursive: symlink's descendants not in way by Jonathan Tan · 5 years ago
  28. 4615a8c merge-recursive: alphabetize include list by Elijah Newren · 6 years ago
  29. 45ef16f merge-recursive: add sanity checks for relevant merge_options by Elijah Newren · 6 years ago
  30. f3081da merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_* by Elijah Newren · 6 years ago
  31. 5bf7e57 merge-recursive: split internal fields into a separate struct by Elijah Newren · 6 years ago
  32. e95e481 merge-recursive: avoid losing output and leaking memory holding that output by Elijah Newren · 6 years ago
  33. a779fb8 merge-recursive: comment and reorder the merge_options fields by Elijah Newren · 6 years ago
  34. 8599ab4 merge-recursive: consolidate unnecessary fields in merge_options by Elijah Newren · 6 years ago
  35. 7c0a6c8 merge-recursive: move some definitions around to clean up the header by Elijah Newren · 6 years ago
  36. bab5687 merge-recursive: rename 'mrtree' to 'result_tree', for clarity by Elijah Newren · 6 years ago
  37. ff1bfa2 merge-recursive: use common name for ancestors/common/base_list by Elijah Newren · 6 years ago
  38. 4d7101e merge-recursive: fix some overly long lines by Elijah Newren · 6 years ago
  39. 724dd76 cache-tree: share code between functions writing an index as a tree by Elijah Newren · 6 years ago
  40. 345480d merge-recursive: don't force external callers to do our logging by Elijah Newren · 6 years ago
  41. b4db8a2 merge-recursive: remove useless parameter in merge_trees() by Elijah Newren · 6 years ago
  42. 98a1d3d merge-recursive: exit early if index != head by Elijah Newren · 6 years ago
  43. 10f751c merge-recursive: remove another implicit dependency on the_repository by Elijah Newren · 6 years ago
  44. f836bf3 merge-recursive: future-proof update_file_flags() against memory leaks by Elijah Newren · 6 years ago
  45. 8e01251 merge-recursive: introduce an enum for detect_directory_renames values by Derrick Stolee · 6 years ago
  46. 743474c merge-recursive: provide a better label for diff3 common ancestor by Elijah Newren · 6 years ago
  47. 139ef37 merge-recursive: enforce opt->ancestor != NULL when calling merge_trees() by Elijah Newren · 6 years ago
  48. d8523ca merge-recursive: be consistent with assert by Elijah Newren · 6 years ago
  49. 0bdaec1 Merge branch 'en/disable-dir-rename-in-recursive-merge' by Junio C Hamano · 6 years ago
  50. ff6d547 merge-recursive: avoid directory rename detection in recursive case by Elijah Newren · 6 years ago
  51. 34e7771 Use the right 'struct repository' instead of the_repository by Nguyễn Thái Ngọc Duy · 6 years ago
  52. 90d3405 match-trees.c: remove the_repo from shift_tree*() by Nguyễn Thái Ngọc Duy · 6 years ago
  53. 50ddb08 tree-walk.c: remove the_repo from get_tree_entry() by Nguyễn Thái Ngọc Duy · 6 years ago
  54. 20fbf7d Merge branch 'en/merge-directory-renames-fix' by Junio C Hamano · 6 years ago
  55. 481de8a merge-recursive: restore accidentally dropped setting of path by Elijah Newren · 6 years ago
  56. 0b179f3 Merge branch 'nd/sha1-name-c-wo-the-repository' by Junio C Hamano · 6 years ago
  57. 96379f0 Merge branch 'en/merge-directory-renames' by Junio C Hamano · 6 years ago
  58. a133c40 commit.cocci: refactor code, avoid double rewrite by Nguyễn Thái Ngọc Duy · 6 years ago
  59. 8c8e5bd merge-recursive: switch directory rename detection default by Elijah Newren · 6 years ago
  60. e62d112 merge-recursive: give callers of handle_content_merge() access to contents by Elijah Newren · 6 years ago
  61. 6d169fd merge-recursive: track information associated with directory renames by Elijah Newren · 6 years ago
  62. 8daec1d merge-recursive: switch from (oid,mode) pairs to a diff_filespec by Elijah Newren · 6 years ago
  63. e2d563d merge-recursive: cleanup handle_rename_* function signatures by Elijah Newren · 6 years ago
  64. c336ab8 merge-recursive: track branch where rename occurred in rename struct by Elijah Newren · 6 years ago
  65. 3f9c92e merge-recursive: remove ren[12]_other fields from rename_conflict_info by Elijah Newren · 6 years ago
  66. e9cd1b5 merge-recursive: shrink rename_conflict_info by Elijah Newren · 6 years ago
  67. 967d6be merge-recursive: move some struct declarations together by Elijah Newren · 6 years ago
  68. 043622b merge-recursive: use 'ci' for rename_conflict_info variable name by Elijah Newren · 6 years ago
  69. 93a02c5 merge-recursive: rename locals 'o' and 'a' to 'obuf' and 'abuf' by Elijah Newren · 6 years ago
  70. e3de888 merge-recursive: rename diff_filespec 'one' to 'o' by Elijah Newren · 6 years ago
  71. 259ccb6 merge-recursive: rename merge_options argument from 'o' to 'opt' by Elijah Newren · 6 years ago
  72. 5ec1e72 Use 'unsigned short' for mode, like diff_filespec does by Elijah Newren · 6 years ago
  73. db1ba2a submodule: avoid hard-coded constants by brian m. carlson · 6 years ago
  74. b0e7fb2 Merge branch 'nd/completion-more-parameters' by Junio C Hamano · 6 years ago
  75. 5a59a23 completion: add more parameter value completion by Nguyễn Thái Ngọc Duy · 6 years ago
  76. b53c502 merge-recursive: drop several unused parameters by Jeff King · 6 years ago
  77. 7589e63 Merge branch 'nd/the-index-final' by Junio C Hamano · 6 years ago
  78. d6f05a4 Merge branch 'nd/attr-pathspec-in-tree-walk' by Junio C Hamano · 6 years ago
  79. 150fe06 read-cache.c: remove the_* from index_has_changes() by Nguyễn Thái Ngọc Duy · 6 years ago
  80. d7cf3a9 merge-recursive.c: remove implicit dependency on the_repository by Nguyễn Thái Ngọc Duy · 6 years ago
  81. 0d6caa2 merge-recursive.c: remove implicit dependency on the_index by Nguyễn Thái Ngọc Duy · 6 years ago
  82. e1ff0a3 read-cache.c: kill read_index() by Nguyễn Thái Ngọc Duy · 6 years ago
  83. 3a95f31 repository.c: replace hold_locked_index() with repo_hold_locked_index() by Nguyễn Thái Ngọc Duy · 6 years ago
  84. ac193e0 Merge branch 'en/merge-path-collision' by Junio C Hamano · 6 years ago
  85. e092073 tree.c: make read_tree*() take 'struct repository *' by Nguyễn Thái Ngọc Duy · 6 years ago
  86. 80cee6e merge-recursive: combine error handling by Derrick Stolee · 6 years ago
  87. 48c9cb9 merge-recursive: improve rename/rename(1to2)/add[/add] handling by Elijah Newren · 6 years ago
  88. dcf2815 merge-recursive: use handle_file_collision for add/add conflicts by Elijah Newren · 6 years ago
  89. bbafc9c merge-recursive: improve handling for rename/rename(2to1) conflicts by Elijah Newren · 6 years ago
  90. 7f86716 merge-recursive: fix rename/add conflict handling by Elijah Newren · 6 years ago
  91. 37b65ce merge-recursive: new function for better colliding conflict resolutions by Elijah Newren · 6 years ago
  92. b2a7942 merge-recursive: increase marker length with depth of recursion by Elijah Newren · 6 years ago
  93. ff8e25e Merge branch 'en/merge-cleanup-more' by Junio C Hamano · 6 years ago
  94. 11877b9 Merge branch 'nd/the-index' by Junio C Hamano · 6 years ago
  95. 4f44545 merge-recursive: avoid showing conflicts with merge branch before HEAD by Elijah Newren · 6 years ago
  96. 2b168ef merge-recursive: improve auto-merging messages with path collisions by Elijah Newren · 6 years ago
  97. 74bb463 Merge branch 'en/merge-cleanup' by Junio C Hamano · 6 years ago
  98. ae109a9 Merge branch 'en/double-semicolon-fix' by Junio C Hamano · 6 years ago
  99. 2abf350 revision.c: remove implicit dependency on the_index by Nguyễn Thái Ngọc Duy · 6 years ago
  100. 32eaa46 ll-merge.c: remove implicit dependency on the_index by Nguyễn Thái Ngọc Duy · 6 years ago