Google Git
Sign in
googlers / jrn / git / e336bdc5b9bcb62982da9708dfb6e68150de72a3 / merge-recursive.h
  1. f1e2426 merge-recursive: offer an option to retain the output in 'obuf' by Johannes Schindelin · 9 years ago
  2. 4e8161a merge-recursive: convert merge_recursive_generic() to object_id by brian m. carlson · 9 years ago
  3. d2b11ec merge-recursive: option to disable renames by Felipe Gonçalves Assis · 9 years ago
  4. db699a8 Move try_merge_command and checkout_fast_forward to libgit.a by Nguyễn Thái Ngọc Duy · 12 years ago
  5. 70cc3d3 merge-recursive: Save D/F conflict filenames instead of unlinking them by Elijah Newren · 14 years ago
  6. 0ce6a51 Merge branch 'jk/merge-rename-ux' by Junio C Hamano · 14 years ago
  7. 99bfc66 merge: enable progress reporting for rename detection by Jeff King · 14 years ago
  8. bf0ab10 merge: improve inexact rename limit warning by Jeff King · 14 years ago
  9. 67ac1e1 cherry-pick/revert: add support for -X/--strategy-option by Jonathan Nieder · 14 years ago
  10. 329351f Merge branch 'kb/merge-recursive-rename-threshold' by Junio C Hamano · 14 years ago
  11. 75b17fe Merge branch 'jf/merge-ignore-ws' by Junio C Hamano · 14 years ago
  12. 10ae752 merge-recursive: option to specify rename threshold by Kevin Ballard · 14 years ago
  13. c208e05 Merge branch 'dg/local-mod-error-messages' by Junio C Hamano · 15 years ago
  14. 8aed4a5 Merge branch 'jn/merge-renormalize' by Junio C Hamano · 15 years ago
  15. dc1166e Move set_porcelain_error_msgs to unpack-trees.c and rename it by Matthieu Moy · 15 years ago
  16. 58a1ece merge-recursive --patience by Justin Frankel · 15 years ago
  17. 635a7bb merge-recursive: expose merge options for builtin merge by Jonathan Nieder · 15 years ago
  18. 23cbf11 merge-recursive: porcelain messages for checkout by Diane Gasselin · 15 years ago
  19. 08353eb Turn unpack_trees_options.msgs into an array + enum by Matthieu Moy · 15 years ago
  20. 1bc0ab7 merge-trees: let caller decide whether to renormalize by Jonathan Nieder · 15 years ago
  21. 8d676d8 Merge branch 'gv/portable' by Junio C Hamano · 15 years ago
  22. 4b05548 enums: omit trailing comma for portability by Gary V. Vaughan · 15 years ago
  23. c674d05 merge: make function try_merge_command non static by Christian Couder · 15 years ago
  24. 4c5868f merge_trees(): add ancestor label parameter for diff3-style output by Jonathan Nieder · 15 years ago
  25. fcb2a7e Merge branch 'ap/merge-backend-opts' by Junio C Hamano · 15 years ago
  26. 85e51b7 Make "subtree" part more orthogonal to the rest of merge-recursive. by Junio C Hamano · 17 years ago
  27. 8cc5b29 git merge -X<option> by Avery Pennarun · 15 years ago
  28. 264b774 merge-recursive: make the error-message generation an extern function by Matthieu Moy · 15 years ago
  29. 696ee23 merge-recursive: move current_{file,directory}_set to struct merge_options by Miklos Vajna · 17 years ago
  30. c7d8492 merge-recursive: move the global obuf to struct merge_options by Miklos Vajna · 17 years ago
  31. 5033639 merge-recursive: move call_depth to struct merge_options by Miklos Vajna · 17 years ago
  32. 8a2fce1 merge-recursive: introduce merge_options by Miklos Vajna · 17 years ago
  33. 73118f8 merge-recursive.c: Add more generic merge_recursive_generic() by Stephan Beyer · 17 years ago
  34. 9047ebb Split out merge_recursive() to merge-recursive.c by Miklos Vajna · 17 years ago
  35. e1b3a2c Build-in merge-recursive by Daniel Barkalow · 17 years ago