Google Git
Sign in
googlers / jrn / git / a1155adc2dde23fd664ad47399379cd0561762af / merge-recursive.h
  1. c208e05 Merge branch 'dg/local-mod-error-messages' by Junio C Hamano · 15 years ago
  2. 8aed4a5 Merge branch 'jn/merge-renormalize' by Junio C Hamano · 15 years ago
  3. dc1166e Move set_porcelain_error_msgs to unpack-trees.c and rename it by Matthieu Moy · 15 years ago
  4. 23cbf11 merge-recursive: porcelain messages for checkout by Diane Gasselin · 15 years ago
  5. 08353eb Turn unpack_trees_options.msgs into an array + enum by Matthieu Moy · 15 years ago
  6. 1bc0ab7 merge-trees: let caller decide whether to renormalize by Jonathan Nieder · 15 years ago
  7. 8d676d8 Merge branch 'gv/portable' by Junio C Hamano · 15 years ago
  8. 4b05548 enums: omit trailing comma for portability by Gary V. Vaughan · 15 years ago
  9. c674d05 merge: make function try_merge_command non static by Christian Couder · 15 years ago
  10. 4c5868f merge_trees(): add ancestor label parameter for diff3-style output by Jonathan Nieder · 15 years ago
  11. fcb2a7e Merge branch 'ap/merge-backend-opts' by Junio C Hamano · 15 years ago
  12. 85e51b7 Make "subtree" part more orthogonal to the rest of merge-recursive. by Junio C Hamano · 17 years ago
  13. 8cc5b29 git merge -X<option> by Avery Pennarun · 15 years ago
  14. 264b774 merge-recursive: make the error-message generation an extern function by Matthieu Moy · 15 years ago
  15. 696ee23 merge-recursive: move current_{file,directory}_set to struct merge_options by Miklos Vajna · 17 years ago
  16. c7d8492 merge-recursive: move the global obuf to struct merge_options by Miklos Vajna · 17 years ago
  17. 5033639 merge-recursive: move call_depth to struct merge_options by Miklos Vajna · 17 years ago
  18. 8a2fce1 merge-recursive: introduce merge_options by Miklos Vajna · 17 years ago
  19. 73118f8 merge-recursive.c: Add more generic merge_recursive_generic() by Stephan Beyer · 17 years ago
  20. 9047ebb Split out merge_recursive() to merge-recursive.c by Miklos Vajna · 17 years ago
  21. e1b3a2c Build-in merge-recursive by Daniel Barkalow · 17 years ago