Google Git
Sign in
googlers / jrn / git / 499352c2adf9c038ec3469d73590b1c55b6a343b / merge-recursive.c
  1. 20fbf7d Merge branch 'en/merge-directory-renames-fix' by Junio C Hamano · 6 years ago
  2. 481de8a merge-recursive: restore accidentally dropped setting of path by Elijah Newren · 6 years ago
  3. 0b179f3 Merge branch 'nd/sha1-name-c-wo-the-repository' by Junio C Hamano · 6 years ago
  4. 96379f0 Merge branch 'en/merge-directory-renames' by Junio C Hamano · 6 years ago
  5. a133c40 commit.cocci: refactor code, avoid double rewrite by Nguyễn Thái Ngọc Duy · 6 years ago
  6. 8c8e5bd merge-recursive: switch directory rename detection default by Elijah Newren · 6 years ago
  7. e62d112 merge-recursive: give callers of handle_content_merge() access to contents by Elijah Newren · 6 years ago
  8. 6d169fd merge-recursive: track information associated with directory renames by Elijah Newren · 6 years ago
  9. 8daec1d merge-recursive: switch from (oid,mode) pairs to a diff_filespec by Elijah Newren · 6 years ago
  10. e2d563d merge-recursive: cleanup handle_rename_* function signatures by Elijah Newren · 6 years ago
  11. c336ab8 merge-recursive: track branch where rename occurred in rename struct by Elijah Newren · 6 years ago
  12. 3f9c92e merge-recursive: remove ren[12]_other fields from rename_conflict_info by Elijah Newren · 6 years ago
  13. e9cd1b5 merge-recursive: shrink rename_conflict_info by Elijah Newren · 6 years ago
  14. 967d6be merge-recursive: move some struct declarations together by Elijah Newren · 6 years ago
  15. 043622b merge-recursive: use 'ci' for rename_conflict_info variable name by Elijah Newren · 6 years ago
  16. 93a02c5 merge-recursive: rename locals 'o' and 'a' to 'obuf' and 'abuf' by Elijah Newren · 6 years ago
  17. e3de888 merge-recursive: rename diff_filespec 'one' to 'o' by Elijah Newren · 6 years ago
  18. 259ccb6 merge-recursive: rename merge_options argument from 'o' to 'opt' by Elijah Newren · 6 years ago
  19. 5ec1e72 Use 'unsigned short' for mode, like diff_filespec does by Elijah Newren · 6 years ago
  20. db1ba2a submodule: avoid hard-coded constants by brian m. carlson · 6 years ago
  21. b0e7fb2 Merge branch 'nd/completion-more-parameters' by Junio C Hamano · 6 years ago
  22. 5a59a23 completion: add more parameter value completion by Nguyễn Thái Ngọc Duy · 6 years ago
  23. b53c502 merge-recursive: drop several unused parameters by Jeff King · 6 years ago
  24. 7589e63 Merge branch 'nd/the-index-final' by Junio C Hamano · 6 years ago
  25. d6f05a4 Merge branch 'nd/attr-pathspec-in-tree-walk' by Junio C Hamano · 6 years ago
  26. 150fe06 read-cache.c: remove the_* from index_has_changes() by Nguyễn Thái Ngọc Duy · 6 years ago
  27. d7cf3a9 merge-recursive.c: remove implicit dependency on the_repository by Nguyễn Thái Ngọc Duy · 6 years ago
  28. 0d6caa2 merge-recursive.c: remove implicit dependency on the_index by Nguyễn Thái Ngọc Duy · 6 years ago
  29. e1ff0a3 read-cache.c: kill read_index() by Nguyễn Thái Ngọc Duy · 6 years ago
  30. 3a95f31 repository.c: replace hold_locked_index() with repo_hold_locked_index() by Nguyễn Thái Ngọc Duy · 6 years ago
  31. ac193e0 Merge branch 'en/merge-path-collision' by Junio C Hamano · 6 years ago
  32. e092073 tree.c: make read_tree*() take 'struct repository *' by Nguyễn Thái Ngọc Duy · 6 years ago
  33. 80cee6e merge-recursive: combine error handling by Derrick Stolee · 6 years ago
  34. 48c9cb9 merge-recursive: improve rename/rename(1to2)/add[/add] handling by Elijah Newren · 6 years ago
  35. dcf2815 merge-recursive: use handle_file_collision for add/add conflicts by Elijah Newren · 6 years ago
  36. bbafc9c merge-recursive: improve handling for rename/rename(2to1) conflicts by Elijah Newren · 6 years ago
  37. 7f86716 merge-recursive: fix rename/add conflict handling by Elijah Newren · 6 years ago
  38. 37b65ce merge-recursive: new function for better colliding conflict resolutions by Elijah Newren · 6 years ago
  39. b2a7942 merge-recursive: increase marker length with depth of recursion by Elijah Newren · 6 years ago
  40. ff8e25e Merge branch 'en/merge-cleanup-more' by Junio C Hamano · 6 years ago
  41. 11877b9 Merge branch 'nd/the-index' by Junio C Hamano · 6 years ago
  42. 4f44545 merge-recursive: avoid showing conflicts with merge branch before HEAD by Elijah Newren · 6 years ago
  43. 2b168ef merge-recursive: improve auto-merging messages with path collisions by Elijah Newren · 6 years ago
  44. 74bb463 Merge branch 'en/merge-cleanup' by Junio C Hamano · 6 years ago
  45. ae109a9 Merge branch 'en/double-semicolon-fix' by Junio C Hamano · 6 years ago
  46. 2abf350 revision.c: remove implicit dependency on the_index by Nguyễn Thái Ngọc Duy · 6 years ago
  47. 32eaa46 ll-merge.c: remove implicit dependency on the_index by Nguyễn Thái Ngọc Duy · 6 years ago
  48. e675765 diff.c: remove implicit dependency on the_index by Nguyễn Thái Ngọc Duy · 6 years ago
  49. d957355 merge-recursive: rename merge_file_1() and merge_content() by Elijah Newren · 6 years ago
  50. 0270a07 merge-recursive: remove final remaining caller of merge_file_one() by Elijah Newren · 6 years ago
  51. 75f3fa7 merge-recursive: avoid wrapper function when unnecessary and wasteful by Elijah Newren · 6 years ago
  52. 52396e1 merge-recursive: set paths correctly when three-way merging content by Elijah Newren · 6 years ago
  53. 769af0f Merge branch 'jk/cocci' by Junio C Hamano · 6 years ago
  54. 1b7a91d Merge branch 'ds/reachable' by Junio C Hamano · 6 years ago
  55. c3b9bc9 Remove superfluous trailing semicolons by Elijah Newren · 7 years ago
  56. ca676b9 Merge branch 'en/directory-renames-nothanks' by Junio C Hamano · 7 years ago
  57. 5fdddd9 merge-recursive: add ability to turn off directory rename detection by Elijah Newren · 7 years ago
  58. 4a7e27e convert "oidcmp() == 0" to oideq() by Jeff King · 7 years ago
  59. dc0f6f9 Merge branch 'nd/no-the-index' by Junio C Hamano · 7 years ago
  60. e4095da Merge branch 'en/merge-recursive-skip-fix' by Junio C Hamano · 7 years ago
  61. 7f944e2 convert.c: remove an implicit dependency on the_index by Nguyễn Thái Ngọc Duy · 7 years ago
  62. c18ac30 Merge branch 'en/dirty-merge-fixes' by Junio C Hamano · 7 years ago
  63. ae533c4 Merge branch 'jm/cache-entry-from-mem-pool' by Junio C Hamano · 7 years ago
  64. 3a2a1dc Merge branch 'sb/object-store-lookup' by Junio C Hamano · 7 years ago
  65. 2b75fb6 merge-recursive: preserve skip_worktree bit when necessary by Elijah Newren · 7 years ago
  66. 6404355 commit.h: remove method declarations by Derrick Stolee · 7 years ago
  67. 00624d6 Merge branch 'sb/object-store-grafts' by Junio C Hamano · 7 years ago
  68. 473b8bb Merge branch 'en/merge-recursive-cleanup' by Junio C Hamano · 7 years ago
  69. eddd1a4 merge-recursive: enforce rule that index matches head before merging by Elijah Newren · 7 years ago
  70. e1f8694 merge-recursive: fix assumption that head tree being merged is HEAD by Elijah Newren · 7 years ago
  71. 9270239 merge-recursive: make sure when we say we abort that we actually abort by Elijah Newren · 7 years ago
  72. 1b9fbef index_has_changes(): avoid assuming operating on the_index by Elijah Newren · 7 years ago
  73. a849735 block alloc: add lifecycle APIs for cache_entry structs by Jameson Miller · 7 years ago
  74. 825ed4d read-cache: teach make_cache_entry to take object_id by Jameson Miller · 7 years ago
  75. 768d796 read-cache: teach refresh_cache_entry to take istate by Jameson Miller · 7 years ago
  76. a74093d tag: add repository argument to deref_tag by Stefan Beller · 7 years ago
  77. 2122f67 commit: add repository argument to lookup_commit_reference by Stefan Beller · 7 years ago
  78. f86bcc7 tree: add repository argument to lookup_tree by Stefan Beller · 7 years ago
  79. 109cd76 object: add repository argument to parse_object by Stefan Beller · 7 years ago
  80. b16b60f Merge branch 'sb/object-store-grafts' into sb/object-store-lookup by Junio C Hamano · 7 years ago
  81. 1102405 Merge branch 'sb/object-store-alloc' by Junio C Hamano · 7 years ago
  82. b3b2aaf Merge branch 'nd/commit-util-to-slab' by Junio C Hamano · 7 years ago
  83. f72432d Merge branch 'en/rename-directory-detection' by Junio C Hamano · 7 years ago
  84. 9da2d03 merge-recursive: use xstrdup() instead of fixed buffer by René Scharfe · 7 years ago
  85. 8d0d53a Merge branch 'sb/submodule-merge-in-merge-recursive' by Junio C Hamano · 7 years ago
  86. 5b26c3c merge-recursive: add pointer about unduly complex looking code by Elijah Newren · 7 years ago
  87. 8ebe7b0 merge-recursive: rename conflict_rename_*() family of functions by Elijah Newren · 7 years ago
  88. 5455c33 merge-recursive: clarify the rename_dir/RENAME_DIR meaning by Elijah Newren · 7 years ago
  89. 9366536 merge-recursive: align labels with their respective code blocks by Elijah Newren · 7 years ago
  90. d90e759 merge-recursive: fix numerous argument alignment issues by Elijah Newren · 7 years ago
  91. 2d6bad9 merge-recursive: fix miscellaneous grammar error in comment by Elijah Newren · 7 years ago
  92. 40aac22 merge-submodule: reduce output verbosity by Leif Middelschulte · 7 years ago
  93. e47dbec Merge branch 'ma/unpack-trees-free-msgs' by Junio C Hamano · 7 years ago
  94. 0821b73 Merge branch 'sb/submodule-merge-in-merge-recursive' by Junio C Hamano · 7 years ago
  95. 50f08db Merge branch 'js/use-bug-macro' by Junio C Hamano · 7 years ago
  96. 6e2ba77 Merge branch 'bp/merge-rename-config' by Junio C Hamano · 7 years ago
  97. c67de74 Merge branch 'en/rename-directory-detection-reboot' by Junio C Hamano · 7 years ago
  98. c89b6e1 Merge branch 'ds/lazy-load-trees' by Junio C Hamano · 7 years ago
  99. 1c41d28 unpack_trees_options: free messages when done by Martin Ågren · 7 years ago
  100. e2e5ac2 merge: use commit-slab in merge remote desc instead of commit->util by Nguyễn Thái Ngọc Duy · 7 years ago