Google Git
Sign in
googlers / jrn / git / 56173d28a5fb811c9525a8d5052ab6d83a07122e / merge-blobs.c
  1. 18b26b1 Merge branch 'jk/no-diff-emit-common' by Junio C Hamano · 9 years ago
  2. b779b3a merge-tree: drop generate_common strategy by Jeff King · 9 years ago
  3. ed1c997 Remove get_object_hash. by brian m. carlson · 9 years ago
  4. 7999b2c Add several uses of get_object_hash. by brian m. carlson · 9 years ago
  5. d687839 merge-blobs.c: fix a memleak by Stefan Beller · 10 years ago
  6. fa2364e Which merge_file() function do you mean? by Junio C Hamano · 12 years ago[Renamed (94%) from merge-file.c]
  7. 1e0f8c4 sparse: Fix an "symbol 'merge_file' not decared" warning by Ramsay Jones · 14 years ago
  8. 712516b ll-merge: replace flag argument with options struct by Jonathan Nieder · 15 years ago
  9. 39b5977 Merge branch 'rs/diff-no-minimal' by Junio C Hamano · 15 years ago
  10. 582aa00 git diff too slow for a file by René Scharfe · 15 years ago
  11. e44b385 merge_file(): add comment explaining behavior wrt conflict style by Jonathan Nieder · 15 years ago
  12. f01de62 ll_merge(): add ancestor label parameter for diff3-style output by Jonathan Nieder · 15 years ago
  13. 15b4f7a merge-tree: use ll_merge() not xdl_merge() by Junio C Hamano · 15 years ago
  14. 00f8f97 xdl_merge(): introduce xmparam_t for merge specific parameters by Junio C Hamano · 15 years ago
  15. 9ccd0a8 Always initialize xpparam_t to 0 by Brian Downing · 16 years ago
  16. c279d7e xdl_diff: identify call sites. by Junio C Hamano · 17 years ago
  17. 30b2501 Future-proof source for changes in xdemitconf_t by Johannes Schindelin · 18 years ago
  18. 21666f1 convert object type handling from a string to a number by Nicolas Pitre · 18 years ago
  19. e2b7008 Get rid of the dependency on RCS' merge program by Johannes Schindelin · 18 years ago
  20. 9befac4 Replace uses of strdup with xstrdup. by Shawn Pearce · 19 years ago
  21. 0c79938 Improved three-way blob merging code by Linus Torvalds · 19 years ago