Google Git
Sign in
googlers / jrn / git / 96db324a73fdada6fbe7b63221986f8f18cc63b0 / merge-recursive.c
  1. 955d7be Merge branch 'ta/string-list-init' by Junio C Hamano · 11 years ago
  2. f93d7c6 replace memset with string-list initializers by Tanay Abhra · 11 years ago
  3. 1fc8345 Merge branch 'rs/code-cleaning' by Junio C Hamano · 11 years ago
  4. 788cef8 Merge branch 'nd/split-index' by Junio C Hamano · 11 years ago
  5. 294b268 use strbuf_addch for adding single characters by René Scharfe · 11 years ago
  6. 3b8e8af Merge branch 'jk/xstrfmt' by Junio C Hamano · 11 years ago
  7. e91ae32 Merge branch 'jk/skip-prefix' by Junio C Hamano · 11 years ago
  8. 8061ae8 Merge branch 'jk/commit-buffer-length' by Junio C Hamano · 11 years ago
  9. 95b567c use skip_prefix to avoid repeating strings by Jeff King · 11 years ago
  10. 45bc131 unique_path: fix unlikely heap overflow by Jeff King · 11 years ago
  11. 2831018 use xstrfmt to replace xmalloc + sprintf by Jeff King · 11 years ago
  12. 8597ea3 commit: record buffer length in cache by Jeff King · 11 years ago
  13. bc6b8fc use get_commit_buffer everywhere by Jeff King · 11 years ago
  14. d0cfc3e cache-tree: mark istate->cache_changed on cache tree update by Nguyễn Thái Ngọc Duy · 11 years ago
  15. 03b8664 read-cache: new API write_locked_index instead of write_index/write_cache by Nguyễn Thái Ngọc Duy · 11 years ago
  16. 10322a0 do not create "struct commit" with xcalloc by Jeff King · 11 years ago
  17. ae352c7 merge-recursive.c: fix case-changing merge bug by David Turner · 11 years ago
  18. 6d011b8 Merge branch 'bk/refresh-missing-ok-in-merge-recursive' into maint by Junio C Hamano · 11 years ago
  19. 156d6ed Merge branch 'bk/refresh-missing-ok-in-merge-recursive' by Junio C Hamano · 11 years ago
  20. 6e2068a merge-recursive.c: tolerate missing files while refreshing index by Brad King · 11 years ago
  21. 2576272 read-cache.c: extend make_cache_entry refresh flag with options by Brad King · 11 years ago
  22. d0956cf Merge branch 'mh/safe-create-leading-directories' by Junio C Hamano · 11 years ago
  23. 0be0521 safe_create_leading_directories(): introduce enum for return values by Michael Haggerty · 11 years ago
  24. 5955654 replace {pre,suf}fixcmp() with {starts,ends}_with() by Christian Couder · 11 years ago
  25. b28325d Merge branch 'jk/diff-algo' into maint by Junio C Hamano · 11 years ago
  26. 92d2afd Merge branch 'jk/diff-algo' by Jonathan Nieder · 11 years ago
  27. 6562928 merge-recursive: fix parsing of "diff-algorithm" option by John Keeping · 11 years ago
  28. b02f5ae Merge branch 'jl/submodule-mv' by Junio C Hamano · 12 years ago
  29. 9a08727 remove init_pathspec() in favor of parse_pathspec() by Nguyễn Thái Ngọc Duy · 12 years ago
  30. 9c5e6c8 Convert "struct cache_entry *" to "const ..." wherever possible by Nguyễn Thái Ngọc Duy · 12 years ago
  31. 07924d4 diff: Introduce --diff-algorithm command line option by Michal Privoznik · 12 years ago
  32. fa2364e Which merge_file() function do you mean? by Junio C Hamano · 12 years ago
  33. 8c11b25 Merge branch 'rj/path-cleanup' by Junio C Hamano · 12 years ago
  34. 4e2d094 Call mkpathdup() rather than xstrdup(mkpath(...)) by Ramsay Jones · 13 years ago
  35. 9cd33bb Merge branch 'tr/void-diff-setup-done' by Junio C Hamano · 13 years ago
  36. 8d35c11 Merge branch 'tr/merge-recursive-flush' by Junio C Hamano · 13 years ago
  37. e0453cd merge-recursive: separate message for common ancestors by Ralf Thielow · 13 years ago
  38. f633ea2 merge-recursive: eliminate flush_buffer() in favor of write_in_full() by Thomas Rast · 13 years ago
  39. 2845265 diff_setup_done(): return void by Thomas Rast · 13 years ago
  40. 55653a6 i18n: merge-recursive: mark strings for translation by Jiang Xin · 13 years ago
  41. c0599f6 Merge branch 'jk/diff-no-rename-empty' by Junio C Hamano · 13 years ago
  42. 86c340e Merge branch 'jc/diff-algo-cleanup' by Junio C Hamano · 13 years ago
  43. 4f7cb99 merge-recursive: don't detect renames of empty files by Jeff King · 13 years ago
  44. cba595b drop casts from users EMPTY_TREE_SHA1_BIN by Jeff King · 13 years ago
  45. 307ab20 xdiff: PATIENCE/HISTOGRAM are not independent option bits by Junio C Hamano · 13 years ago
  46. e859c69 cache-tree: update API to take abitrary flags by Nguyễn Thái Ngọc Duy · 13 years ago
  47. 33e7fef Merge branch 'tr/cache-tree' by Junio C Hamano · 13 years ago
  48. 996277c Refactor cache_tree_update idiom from commit by Thomas Rast · 13 years ago
  49. ae8e4c9 merge: make usage of commit->util more extensible by Junio C Hamano · 13 years ago
  50. 8098878 submodule: Search for merges only at end of recursive merge by Brad King · 13 years ago
  51. 9a33b69 Merge branch 'cn/eradicate-working-copy' by Junio C Hamano · 13 years ago
  52. d45b7f4 merge-recursive: Do not look at working tree during a virtual ancestor merge by Junio C Hamano · 13 years ago
  53. f7d650c Remove 'working copy' from the documentation and C code by Carlos Martín Nieto · 13 years ago
  54. 96b7c4d Merge branch 'en/merge-recursive-2' by Junio C Hamano · 14 years ago
  55. 7abd8fb Merge branch 'jn/plug-empty-tree-leak' by Junio C Hamano · 14 years ago
  56. 03f622c merge-recursive: take advantage of hardcoded empty tree by Jonathan Nieder · 14 years ago
  57. f701aae merge-recursive: Don't re-sort a list whose order we depend upon by Elijah Newren · 14 years ago
  58. 6d63070 merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest by Elijah Newren · 14 years ago
  59. 35a74ab merge-recursive: Avoid unnecessary file rewrites by Elijah Newren · 14 years ago
  60. f53d397 merge-recursive: Fix spurious 'refusing to lose untracked file...' messages by Elijah Newren · 14 years ago
  61. 3672c97 merge-recursive: Fix working copy handling for rename/rename/add/add by Elijah Newren · 14 years ago
  62. 1ac91b3 merge-recursive: add handling for rename/rename/add-dest/add-dest by Elijah Newren · 14 years ago
  63. e03acb8 merge-recursive: Have conflict_rename_delete reuse modify/delete code by Elijah Newren · 14 years ago
  64. b703325 merge-recursive: Make modify/delete handling code reusable by Elijah Newren · 14 years ago
  65. 434b852 merge-recursive: Consider modifications in rename/rename(2to1) conflicts by Elijah Newren · 14 years ago
  66. dac4741 merge-recursive: Create function for merging with branchname:file markers by Elijah Newren · 14 years ago
  67. 232c635 merge-recursive: Record more data needed for merging with dual renames by Elijah Newren · 14 years ago
  68. 461f504 merge-recursive: Defer rename/rename(2to1) handling until process_entry by Elijah Newren · 14 years ago
  69. a99b7f2 merge-recursive: Small cleanups for conflict_rename_rename_1to2 by Elijah Newren · 14 years ago
  70. c52ff85 merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base by Elijah Newren · 14 years ago
  71. 6bdaead merge-recursive: Introduce a merge_file convenience function by Elijah Newren · 14 years ago
  72. ec61d14 merge-recursive: Fix modify/delete resolution in the recursive case by Elijah Newren · 14 years ago
  73. 5b448b8 merge-recursive: When we detect we can skip an update, actually skip it by Elijah Newren · 14 years ago
  74. 3c217c0 merge-recursive: Provide more info in conflict markers with file renames by Elijah Newren · 14 years ago
  75. 4f66dad merge-recursive: Cleanup and consolidation of rename_conflict_info by Elijah Newren · 14 years ago
  76. edd2faf merge-recursive: Consolidate process_entry() and process_df_entry() by Elijah Newren · 14 years ago
  77. 51931bf merge-recursive: Improve handling of rename target vs. directory addition by Elijah Newren · 14 years ago
  78. 7769a75 merge-recursive: Add comments about handling rename/add-source cases by Elijah Newren · 14 years ago
  79. 0a6b871 merge-recursive: Make dead code for rename/rename(2to1) conflicts undead by Elijah Newren · 14 years ago
  80. 531357a merge-recursive: Fix deletion of untracked file in rename/delete conflicts by Elijah Newren · 14 years ago
  81. b8ddf16 merge-recursive: Split update_stages_and_entry; only update stages at end by Elijah Newren · 14 years ago
  82. ed0148a merge-recursive: Allow make_room_for_path() to remove D/F entries by Elijah Newren · 14 years ago
  83. aacb82d merge-recursive: Split was_tracked() out of would_lose_untracked() by Elijah Newren · 14 years ago
  84. 70cc3d3 merge-recursive: Save D/F conflict filenames instead of unlinking them by Elijah Newren · 14 years ago
  85. f2507b4 merge-recursive: Fix code checking for D/F conflicts still being present by Elijah Newren · 14 years ago
  86. f0fd4d0 merge-recursive: Fix sorting order and directory change assumptions by Elijah Newren · 14 years ago
  87. 7b1c610 merge-recursive: Fix recursive case with D/F conflict via add/add conflict by Elijah Newren · 14 years ago
  88. 0b30e81 merge-recursive: Avoid working directory changes during recursive case by Elijah Newren · 14 years ago
  89. 3d6b8e8 merge-recursive: Remember to free generated unique path names by Elijah Newren · 14 years ago
  90. 650467c merge-recursive: Consolidate different update_stages functions by Elijah Newren · 14 years ago
  91. 0c05942 merge-recursive: Mark some diff_filespec struct arguments const by Elijah Newren · 14 years ago
  92. abafc88 merge-recursive: Correct a comment by Elijah Newren · 14 years ago
  93. c43ba42 merge-recursive: Make BUG message more legible by adding a newline by Elijah Newren · 14 years ago
  94. 8c912ee teach --histogram to diff by Tay Ray Chuan · 14 years ago
  95. b3c8931 Merge branch 'jc/rename-degrade-cc-to-c' into maint by Junio C Hamano · 14 years ago
  96. 6db4105 Revert "Merge branch 'en/merge-recursive'" by Junio C Hamano · 14 years ago
  97. 2f80de9 Merge branch 'maint' by Junio C Hamano · 14 years ago
  98. 8c2be75 add, merge, diff: do not use strcasecmp to compare config variable names by Jonathan Nieder · 14 years ago
  99. 1273738 Merge branch 'nd/struct-pathspec' by Junio C Hamano · 14 years ago
  100. 76a89d6 Merge branch 'jc/rename-degrade-cc-to-c' by Junio C Hamano · 14 years ago