Google Git
Sign in
googlers / jrn / git / c077a4526ba456ada28d16db9c945afd9a4a57de / builtin / merge-tree.c
  1. b4f5aca sha1_file: convert read_sha1_file to struct object_id by brian m. carlson · 7 years ago
  2. 5c377d3 tree-walk: convert fill_tree_descriptor() to object_id by René Scharfe · 8 years ago
  3. d1a35e5 builtin/merge-tree: convert remaining caller of get_sha1 to object_id by brian m. carlson · 8 years ago
  4. 3aca1fc Convert lookup_blob to struct object_id by brian m. carlson · 8 years ago
  5. 3e93098 Convert remaining callers of lookup_blob to object_id by brian m. carlson · 8 years ago
  6. 7d924c9 struct name_entry: use struct object_id instead of unsigned char sha1[20] by brian m. carlson · 9 years ago
  7. 3733e69 use xmallocz to avoid size arithmetic by Jeff King · 9 years ago
  8. ed1c997 Remove get_object_hash. by brian m. carlson · 9 years ago
  9. f2fd076 Convert struct object to object_id by brian m. carlson · 9 years ago
  10. 7999b2c Add several uses of get_object_hash. by brian m. carlson · 9 years ago
  11. 3efb988 react to errors in xdi_diff by Jeff King · 9 years ago
  12. 5706528 merge-tree: remove unused df_conflict arguments by René Scharfe · 11 years ago
  13. 94883b4 merge-tree: handle directory/empty conflict correctly by John Keeping · 12 years ago
  14. ab5f424 merge-tree: fix typo in "both changed identically" by John Keeping · 12 years ago
  15. aacecc3 merge-tree: don't print entries that match "local" by John Keeping · 12 years ago
  16. 187c00c merge-tree: fix typo in merge-tree.c::unresolved by John Keeping · 12 years ago
  17. 35ffe75 merge-tree: fix d/f conflicts by Junio C Hamano · 12 years ago
  18. 8dd15c6 merge-tree: add comments to clarify what these functions are doing by Junio C Hamano · 12 years ago
  19. 3b8ff51 merge-tree: lose unused "resolve_directories" by Junio C Hamano · 12 years ago
  20. b13112f merge-tree: lose unused "flags" from merge_list by Junio C Hamano · 12 years ago
  21. fa2364e Which merge_file() function do you mean? by Junio C Hamano · 12 years ago
  22. 1e0f8c4 sparse: Fix an "symbol 'merge_file' not decared" warning by Ramsay Jones · 14 years ago
  23. c2e86ad Fix sparse warnings by Stephen Boyd · 14 years ago
  24. 21baa6e merge-tree: fix where two branches share no changes by Will Palmer · 15 years ago
  25. 6033553 Merge branch 'rs/diff-no-minimal' into maint by Junio C Hamano · 15 years ago
  26. 81b50f3 Move 'builtin-*' into a 'builtin/' subdirectory by Linus Torvalds · 15 years ago[Renamed from builtin-merge-tree.c]
  27. 07c0732 merge-tree: remove unnecessary call of git_extract_argv0_path by Johannes Sixt · 15 years ago
  28. 907a7cb make "git merge-tree" a built-in by Linus Torvalds · 15 years ago[Renamed (98%) from merge-tree.c]
  29. 15b4f7a merge-tree: use ll_merge() not xdl_merge() by Junio C Hamano · 15 years ago
  30. 34263de Replace deprecated dashed git commands in usage by Alexander Potashev · 16 years ago
  31. 2fb3f6d Add calls to git_extract_argv0_path() in programs that call git_config_* by Steffen Prohaska · 16 years ago
  32. 19d4b41 Replace xmalloc/memset(0) pairs with xcalloc by Brandon Casey · 16 years ago
  33. 91e4f03 Make 'traverse_trees()' traverse conflicting DF entries in parallel by Linus Torvalds · 17 years ago
  34. 5803c6f Add return value to 'traverse_tree()' callback by Linus Torvalds · 17 years ago
  35. 40d934d Make 'traverse_tree()' use linked structure rather than 'const char *base' by Linus Torvalds · 17 years ago
  36. c279d7e xdl_diff: identify call sites. by Junio C Hamano · 17 years ago
  37. 30b2501 Future-proof source for changes in xdemitconf_t by Johannes Schindelin · 18 years ago
  38. a8c4047 Remove "pathlen" from "struct name_entry" by Linus Torvalds · 18 years ago
  39. 21666f1 convert object type handling from a string to a number by Nicolas Pitre · 18 years ago
  40. 5b6df8e Handle invalid argc gently by Dmitry V. Levin · 19 years ago
  41. 8112894 Make count-objects, describe and merge-tree work in subdirectory by Dmitry V. Levin · 19 years ago
  42. 9befac4 Replace uses of strdup with xstrdup. by Shawn Pearce · 19 years ago
  43. a89fccd Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length. by David Rientjes · 19 years ago
  44. 0c79938 Improved three-way blob merging code by Linus Torvalds · 19 years ago
  45. 8378807 Prepare "git-merge-tree" for future work by Linus Torvalds · 19 years ago
  46. 45f75a0 Merge branch 'fix' by Junio C Hamano · 19 years ago
  47. 31fff30 Separate object name errors from usage errors by Dmitry V. Levin · 19 years ago
  48. dcb3450 sha1_to_hex() usage cleanup by Linus Torvalds · 19 years ago
  49. 1b0c717 tree/diff header cleanup. by Junio C Hamano · 19 years ago
  50. 164dcb9 git-merge-tree: generalize the "traverse <n> trees in sync" functionality by Linus Torvalds · 19 years ago
  51. 01df529 Handling large files with GIT by Linus Torvalds · 19 years ago
  52. 492e075 Handling large files with GIT by Linus Torvalds · 19 years ago
  53. 2fbdd13 Remove "merge-tree.c" by Linus Torvalds · 20 years ago
  54. d07f651 [PATCH] Add '-z' to merge-tree.c by Junio C Hamano · 20 years ago
  55. 33deb63 Add "merge-tree" helper program. Maybe it's retarded, maybe it's helpful. by Linus Torvalds · 20 years ago