Google Git
Sign in
googlers / jrn / git / f64b4856243a9ea9445068a0989c71a8915c3862 / builtin-merge-recursive.c
  1. 0874f46 merge-{recursive,subtree}: use usagef() to print usage by Jonathan Nieder · 15 years ago
  2. b74d779 MinGW: Fix compiler warning in merge-recursive by Johannes Schindelin · 16 years ago
  3. d753070 remove trailing LF in die() messages by Alexander Potashev · 16 years ago
  4. 8a2fce1 merge-recursive: introduce merge_options by Miklos Vajna · 17 years ago
  5. 73118f8 merge-recursive.c: Add more generic merge_recursive_generic() by Stephan Beyer · 17 years ago
  6. 9047ebb Split out merge_recursive() to merge-recursive.c by Miklos Vajna · 17 years ago
  7. a19a424 Revert "Convert output messages in merge-recursive to past tense." by Jonathan del Strother · 17 years ago
  8. c455c87 Rename path_list to string_list by Johannes Schindelin · 17 years ago
  9. e75bf76 Merge branch 'rs/archive' by Junio C Hamano · 17 years ago
  10. 671f070 add context pointer to read_tree_recursive() by René Scharfe · 17 years ago
  11. 6531947 Move commit_list_count() to commit.c by Miklos Vajna · 17 years ago
  12. 8e21d63 clone: create intermediate directories of destination repo by Jeff King · 17 years ago
  13. ea81e10 Merge branch 'js/merge-recursive' by Junio C Hamano · 17 years ago
  14. 249c61a merge-recursive: respect core.autocrlf when writing out the result by Johannes Schindelin · 17 years ago
  15. 9bd81e4 Merge branch 'js/config-cb' by Junio C Hamano · 17 years ago v1.5.6-rc0
  16. ef90d6d Provide git_config with a callback-data parameter by Johannes Schindelin · 17 years ago
  17. b8960bb diff: make "too many files" rename warning optional by Jeff King · 17 years ago
  18. 5070591 bump rename limit defaults by Jeff King · 17 years ago
  19. 2a2ac92 add merge.renamelimit config option by Jeff King · 17 years ago
  20. 16007f3 Merge branch 'maint' by Junio C Hamano · 17 years ago
  21. b85997d Merge branch 'lt/unpack-trees' by Junio C Hamano · 17 years ago
  22. 5d921e2 Merge branch 'jc/cherry-pick' (early part) by Junio C Hamano · 17 years ago
  23. 34110cd Make 'unpack_trees()' have a separate source and destination index by Linus Torvalds · 17 years ago
  24. bc052d7 Make 'unpack_trees()' take the index to work on as an argument by Linus Torvalds · 17 years ago
  25. 5a4d707 Merge branch 'db/checkout' by Junio C Hamano · 17 years ago
  26. 94a5728 Library function to check for unmerged index entries by Daniel Barkalow · 17 years ago
  27. e1b3a2c Build-in merge-recursive by Daniel Barkalow · 17 years ago[Renamed (98%) from merge-recursive.c]
  28. 7a51ed6 Make on-disk index representation separate from in-core one by Linus Torvalds · 17 years ago
  29. 4ed7cd3 Improve use of lockfile API by Brandon Casey · 17 years ago
  30. 790296f Fix grammar nits in documentation and in code comments. by Jim Meyering · 17 years ago
  31. 20b178d Improved submodule merge support by Finn Arne Gangstad · 17 years ago
  32. ff72af0 Support a merge with conflicting gitlink change by Junio C Hamano · 17 years ago
  33. 8f67f8a Make the diff_options bitfields be an unsigned with explicit masks. by Pierre Habouzit · 17 years ago
  34. e2b7eaf Merge branch 'maint' by Junio C Hamano · 17 years ago
  35. f120ae2 merge-recursive.c: mrtree in merge() is not used before set by Junio C Hamano · 17 years ago
  36. 66d4035 Merge branch 'ph/strbuf' by Junio C Hamano · 17 years ago
  37. 102c233 Move make_cache_entry() from merge-recursive.c into read-cache.c by Carlos Rica · 18 years ago
  38. df3a02f Make merge-recursive honor diff.renamelimit by Lars Hjemli · 17 years ago
  39. 19247e5 nfv?asprintf are broken without va_copy, workaround them. by Pierre Habouzit · 17 years ago
  40. 182af83 Use xmemdupz() in many places. by Pierre Habouzit · 17 years ago
  41. 6640f88 Move make_cache_entry() from merge-recursive.c into read-cache.c by Carlos Rica · 18 years ago
  42. 7647b17 Use xmkstemp() instead of mkstemp() by Luiz Fernando N. Capitulino · 18 years ago
  43. b798671 merge-recursive: do not rudely die on binary merge by Junio C Hamano · 18 years ago
  44. 933bf40 Start moving unpack-trees to "struct tree_desc" by Linus Torvalds · 18 years ago
  45. b79d18c -Wold-style-definition fix by Junio C Hamano · 18 years ago
  46. 9f30855 merge-recursive: refuse to merge binary files by Johannes Schindelin · 18 years ago
  47. 0d5e6c9 Ignore merged status of the file-level merge by Alex Riesen · 18 years ago
  48. 8a35981 Add a test for merging changed and rename-changed branches by Alex Riesen · 18 years ago
  49. c135ee8 Avoid excessive rewrites in merge-recursive by Alex Riesen · 18 years ago
  50. a2d7c6c Merge branch 'jc/attr' by Junio C Hamano · 18 years ago
  51. e87b1c9 Fix bogus linked-list management for user defined merge drivers. by Junio C Hamano · 18 years ago
  52. ad57cbc Kill the useless progress meter in merge-recursive by Shawn O. Pearce · 18 years ago
  53. 851c603 Fix working directory errno handling when unlinking a directory by Linus Torvalds · 18 years ago
  54. d56dbd6 Simplify code to find recursive merge driver. by Junio C Hamano · 18 years ago
  55. 15ba3af Counto-fix in merge-recursive by Junio C Hamano · 18 years ago
  56. a5e92ab Fix funny types used in attribute value representation by Junio C Hamano · 18 years ago
  57. 3086486 Allow low-level driver to specify different behaviour during internal merge. by Junio C Hamano · 18 years ago
  58. 153920d Custom low-level merge driver: change the configuration scheme. by Junio C Hamano · 18 years ago
  59. be89cb2 Allow the default low-level merge driver to be configured. by Junio C Hamano · 18 years ago
  60. f3ef6b6 Custom low-level merge driver support. by Junio C Hamano · 18 years ago
  61. a129d96 Allow specifying specialized merge-backend per path. by Junio C Hamano · 18 years ago
  62. 3e5261a merge-recursive: separate out xdl_merge() interface. by Junio C Hamano · 18 years ago
  63. 4d50895 merge-recursive: handle D/F conflict case more carefully. by Junio C Hamano · 18 years ago
  64. ac7f0f4 merge-recursive: do not barf on "to be removed" entries. by Junio C Hamano · 18 years ago
  65. 68faf68 A new merge stragety 'subtree'. by Junio C Hamano · 18 years ago
  66. ee9693e Merge branch 'jc/index-output' by Junio C Hamano · 18 years ago
  67. 0424138 Fix bogus error message from merge-recursive error path by Junio C Hamano · 18 years ago
  68. 30ca07a _GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file. by Junio C Hamano · 18 years ago
  69. a97e407 Keep rename/rename conflicts of intermediate merges while doing recursive merge by Alex Riesen · 18 years ago
  70. 723024d Handle core.symlinks=false case in merge-recursive. by Johannes Sixt · 18 years ago
  71. 21666f1 convert object type handling from a string to a number by Nicolas Pitre · 18 years ago
  72. 17cd29b merge-recursive: fix longstanding bug in merging symlinks by Junio C Hamano · 18 years ago
  73. 005f85d Use pretend_sha1_file() in git-blame and git-merge-recursive. by Junio C Hamano · 18 years ago
  74. 183d797 Keep untracked files not involved in a merge. by Shawn O. Pearce · 18 years ago
  75. 3dff537 Assorted typo fixes by Pavel Roskin · 18 years ago
  76. 89f40be Convert output messages in merge-recursive to past tense. by Shawn O. Pearce · 18 years ago
  77. 3f6ee2d Display a progress meter during merge-recursive. by Shawn O. Pearce · 18 years ago
  78. 66a155b Enable output buffering in merge-recursive. by Shawn O. Pearce · 18 years ago
  79. 8c3275a Allow the user to control the verbosity of merge-recursive. by Shawn O. Pearce · 18 years ago
  80. 6388963 Remove unnecessary call_depth parameter in merge-recursive. by Shawn O. Pearce · 18 years ago
  81. 1cf716a merge-recursive: do not report the resulting tree object name by Junio C Hamano · 18 years ago
  82. 8b944b5 merge-recursive: do not use on-file index when not needed. by Junio C Hamano · 18 years ago
  83. f518438 Speed-up recursive by flushing index only once for all entries by Alex Riesen · 18 years ago
  84. 93822c2 short i/o: fix calls to write to use xwrite or write_in_full by Andy Whitcroft · 18 years ago
  85. a970e84 Allow merging bare trees in merge-recursive. by Shawn O. Pearce · 18 years ago
  86. 7ba3c07 Move better_branch_name above get_ref in merge-recursive. by Shawn O. Pearce · 18 years ago
  87. e0ec181 Display 'theirs' branch name when possible in merge. by Shawn O. Pearce · 18 years ago
  88. d9606e8 Use extended SHA1 syntax in merge-recursive conflicts. by Shawn O. Pearce · 18 years ago
  89. aa1cef5 Merge branch 'jc/clone' by Junio C Hamano · 18 years ago
  90. 8502357 simplify inclusion of system header files. by Junio C Hamano · 18 years ago
  91. d4ebc36 Use preprocessor constants for environment variable names. by Junio C Hamano · 18 years ago
  92. e4d45dd Merge branch 'js/merge' by Junio C Hamano · 18 years ago
  93. 8371234 Remove uncontested renamed files during merge. by Shawn Pearce · 18 years ago
  94. f953831 merge-recursive: add/add really is modify/modify with an empty base by Johannes Schindelin · 18 years ago
  95. 8042ed1 Merge branch 'master' into js/merge by Junio C Hamano · 18 years ago
  96. 9abd46a Make sure the empty tree exists when needed in merge-recursive. by Shawn O. Pearce · 18 years ago
  97. c2b4fae merge-recursive: use xdl_merge(). by Junio C Hamano · 18 years ago
  98. d0a75a1 Merge branch 'jc/read-tree' by Junio C Hamano · 18 years ago
  99. 9faed78 merge-recursive implicitely depends on trust_executable_bit by Alex Riesen · 18 years ago
  100. 65ac6e9 merge-recursive: adjust to loosened "working file clobbered" check by Junio C Hamano · 18 years ago