Google Git
Sign in
googlers / jrn / git / 62a62a28308453ee830bb7e02cf732474a6e01a5 / notes-merge.c
  1. 362f869 Merge branch 'ab/diff-free-more' by Junio C Hamano · 3 years, 1 month ago
  2. 244c272 diff.[ch]: have diff_free() call clear_pathspec(opts.pathspec) by Ævar Arnfjörð Bjarmason · 3 years, 1 month ago
  3. 35f6967 ll-merge: make callers responsible for showing warnings by Elijah Newren · 3 years, 2 months ago
  4. ed9bff0 advice: remove read uses of most global `advice_` variables by Ben Boeckel · 3 years, 7 months ago
  5. 33be431 Merge branch 'en/dir-traversal' by Junio C Hamano · 3 years, 10 months ago
  6. b548f0f dir: introduce readdir_skip_dot_and_dotdot() helper by Elijah Newren · 3 years, 11 months ago
  7. 5feebdd Merge branch 'js/merge-already-up-to-date-message-reword' by Junio C Hamano · 3 years, 11 months ago
  8. 80cde95 merge(s): apply consistent punctuation to "up to date" messages by Eric Sunshine · 4 years ago
  9. 1422844 hash: provide per-algorithm null OIDs by brian m. carlson · 4 years ago
  10. ca56dad use CALLOC_ARRAY by René Scharfe · 4 years, 1 month ago
  11. 2235030 notes-merge: switch to use the_hash_algo by brian m. carlson · 6 years ago
  12. 1d18d75 notes-utils.c: remove the_repository references by Nguyễn Thái Ngọc Duy · 6 years ago
  13. 878d832 notes-merge.c: remove implicit dependency the_repository by Nguyễn Thái Ngọc Duy · 6 years ago
  14. 5684200 notes-merge.c: remove implicit dependency on the_index by Nguyễn Thái Ngọc Duy · 6 years ago
  15. 11877b9 Merge branch 'nd/the-index' by Junio C Hamano · 6 years ago
  16. 58bf2a4 sha1-file.c: remove implicit dependency on the_index by Nguyễn Thái Ngọc Duy · 7 years ago
  17. 32eaa46 ll-merge.c: remove implicit dependency on the_index by Nguyễn Thái Ngọc Duy · 7 years ago
  18. e675765 diff.c: remove implicit dependency on the_index by Nguyễn Thái Ngọc Duy · 7 years ago
  19. 769af0f Merge branch 'jk/cocci' by Junio C Hamano · 7 years ago
  20. 4a7e27e convert "oidcmp() == 0" to oideq() by Jeff King · 7 years ago
  21. 6404355 commit.h: remove method declarations by Derrick Stolee · 7 years ago
  22. 2122f67 commit: add repository argument to lookup_commit_reference by Stefan Beller · 7 years ago
  23. b16b60f Merge branch 'sb/object-store-grafts' into sb/object-store-lookup by Junio C Hamano · 7 years ago
  24. 50f08db Merge branch 'js/use-bug-macro' by Junio C Hamano · 7 years ago
  25. c89b6e1 Merge branch 'ds/lazy-load-trees' by Junio C Hamano · 7 years ago
  26. cbd53a2 object-store: move object access functions to object-store.h by Stefan Beller · 7 years ago
  27. 033abf9 Replace all die("BUG: ...") calls by BUG() ones by Johannes Schindelin · 7 years ago
  28. 2e27bd7 treewide: replace maybe_tree with accessor methods by Derrick Stolee · 7 years ago
  29. 891435d treewide: rename tree to maybe_tree by Derrick Stolee · 7 years ago
  30. b4f5aca sha1_file: convert read_sha1_file to struct object_id by brian m. carlson · 7 years ago
  31. 5078f34 commit: convert commit_tree* to object_id by Patryk Obara · 7 years ago
  32. eb0ccfd Switch empty tree and blob lookups to use hash abstraction by brian m. carlson · 7 years ago
  33. 8cc6332 Merge branch 'bw/diff-opt-impl-to-bitfields' by Junio C Hamano · 7 years ago
  34. 0d1e0e7 diff: make struct diff_flags members lowercase by Brandon Williams · 7 years ago
  35. 23dcf77 diff: remove DIFF_OPT_SET macro by Brandon Williams · 7 years ago
  36. 34c290a refs: convert read_ref and read_ref_full to object_id by brian m. carlson · 7 years ago
  37. a1f3515 notes-merge: drop dead zero-write code by Jeff King · 8 years ago
  38. c50424a Merge branch 'jk/write-in-full-fix' by Junio C Hamano · 8 years ago
  39. 634eb82 notes-merge: use ssize_t for write_in_full() return value by Jeff King · 8 years ago
  40. 8e36002 Merge branch 'ma/up-to-date' by Junio C Hamano · 8 years ago
  41. 7560f54 treewide: correct several "up-to-date" to "up to date" by Martin Ågren · 8 years ago
  42. 98e019b sha1_file: convert index_path to struct object_id by Patryk Obara · 8 years ago
  43. f331ab9 use MOVE_ARRAY by René Scharfe · 8 years ago
  44. 66f414f diff-tree: convert diff_tree_sha1 to struct object_id by Brandon Williams · 8 years ago
  45. 9e5e0c2 notes-merge: convert write_note_to_worktree to struct object_id by Brandon Williams · 8 years ago
  46. 4d77896 notes-merge: convert verify_notes_filepair to struct object_id by Brandon Williams · 8 years ago
  47. d7a7c70 notes-merge: convert find_notes_merge_pair_ps to struct object_id by Brandon Williams · 8 years ago
  48. 9d6babb notes-merge: convert merge_from_diffs to struct object_id by Brandon Williams · 8 years ago
  49. 5237e0e notes-merge: convert notes_merge* to struct object_id by Brandon Williams · 8 years ago
  50. 5ee8a95 notes: convert some accessor functions to struct object_id by brian m. carlson · 8 years ago
  51. bc83266 Convert lookup_commit* to struct object_id by brian m. carlson · 8 years ago
  52. 1e43ed9 Convert remaining callers of lookup_commit_reference* to object_id by brian m. carlson · 8 years ago
  53. 8c2ca3a replace strbuf_addstr(git_path()) with git_path_buf() by Jeff King · 8 years ago
  54. 8969fea Merge branch 'va/i18n-more' by Junio C Hamano · 9 years ago
  55. c041c6d i18n: notes-merge: mark die messages for translation by Vasco Almeida · 9 years ago
  56. d449347 Convert read_mmblob to take struct object_id. by brian m. carlson · 9 years ago
  57. e910bb1 notes-merge: convert struct notes_merge_pair to struct object_id by brian m. carlson · 9 years ago
  58. d0b6966 Merge branch 'rs/notes-merge-no-toctou' by Junio C Hamano · 9 years ago
  59. a63d31b Merge branch 'bc/cocci' by Junio C Hamano · 9 years ago
  60. deb9c15 notes-merge: use O_EXCL to avoid overwriting existing files by René Scharfe · 9 years ago
  61. a0d12c4 diff: convert struct diff_filespec to struct object_id by brian m. carlson · 9 years ago
  62. ed6e803 pathspec: rename free_pathspec() to clear_pathspec() by Junio C Hamano · 9 years ago
  63. ed1c997 Remove get_object_hash. by brian m. carlson · 9 years ago
  64. f2fd076 Convert struct object to object_id by brian m. carlson · 9 years ago
  65. 7999b2c Add several uses of get_object_hash. by brian m. carlson · 9 years ago
  66. fcd12db prefer git_pathdup to git_path in some possibly-dangerous cases by Jeff King · 10 years ago
  67. 68a2e6a Merge branch 'nd/multiple-work-trees' by Junio C Hamano · 10 years ago
  68. 0985015 Merge branch 'jc/merge-bases' by Junio C Hamano · 10 years ago
  69. dcf6926 path.c: make get_pathname() call sites return const char * by Nguyễn Thái Ngọc Duy · 10 years ago
  70. 2ce406c get_merge_bases(): always clean-up object flags by Junio C Hamano · 10 years ago
  71. 7695d11 refs.c: change resolve_ref_unsafe reading argument to be a flags field by Ronnie Sahlberg · 11 years ago
  72. 8597ea3 commit: record buffer length in cache by Jeff King · 11 years ago
  73. bc6b8fc use get_commit_buffer everywhere by Jeff King · 11 years ago
  74. e6dfcd6 replace dangerous uses of strbuf_attach by Jeff King · 11 years ago
  75. 3ffefb5 commit_tree: take a pointer/len pair rather than a const strbuf by Jeff King · 11 years ago
  76. bd1928d remove diff_tree_{setup,release}_paths by Nguyễn Thái Ngọc Duy · 12 years ago
  77. bf9a05b Move create_notes_commit() from notes-merge.c into notes-utils.c by Johan Herland · 12 years ago
  78. 9cd33bb Merge branch 'tr/void-diff-setup-done' by Junio C Hamano · 13 years ago
  79. 2845265 diff_setup_done(): return void by Thomas Rast · 13 years ago
  80. 2ca0c53 notes-merge: remove i18n legos in merge result message by Nguyễn Thái Ngọc Duy · 13 years ago
  81. dabba59 notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwd by Johan Herland · 13 years ago
  82. a0be62c notes-merge: use opendir/readdir instead of using read_directory() by Johan Herland · 13 years ago
  83. 5de89d3 Merge branch 'jc/show-sig' by Junio C Hamano · 13 years ago
  84. f35ccd9 Merge branch 'nd/war-on-nul-in-commit' by Junio C Hamano · 13 years ago
  85. 13f8b72 Convert commit_tree() to take strbuf as message by Nguyễn Thái Ngọc Duy · 13 years ago
  86. b7f7c07 Merge branch 'nd/resolve-ref' by Junio C Hamano · 13 years ago
  87. 4c00c85 Sync with 1.7.7.4 by Junio C Hamano · 13 years ago
  88. 01e0f16 Merge branch 'jn/maint-notes-avoid-va-args' into maint by Junio C Hamano · 13 years ago
  89. 5f9f8d1 notes merge: eliminate OUTPUT macro by Jonathan Nieder · 13 years ago
  90. c689332 Convert many resolve_ref() calls to read_ref*() and ref_exists() by Nguyễn Thái Ngọc Duy · 13 years ago
  91. ba3c69a commit: teach --gpg-sign option by Junio C Hamano · 13 years ago
  92. e579a5d Merge branch 'mh/maint-notes-merge-pathbuf-fix' by Junio C Hamano · 13 years ago
  93. 8d9c501 Change check_ref_format() to take a flags argument by Michael Haggerty · 14 years ago
  94. 8528445 notes_merge_commit(): do not pass temporary buffer to other function by Michael Haggerty · 14 years ago
  95. c4ce46f index_fd(): turn write_object and format_check arguments into one flag by Junio C Hamano · 14 years ago
  96. c2e86ad Fix sparse warnings by Stephen Boyd · 14 years ago
  97. dab0d41 correct type of EMPTY_TREE_SHA1_BIN by Jonathan Nieder · 14 years ago
  98. a6a0909 git notes merge: Add another auto-resolving strategy: "cat_sort_uniq" by Johan Herland · 14 years ago
  99. 443259c git notes merge: List conflicting notes in notes merge commit message by Johan Herland · 14 years ago
  100. 6abb365 git notes merge: Manual conflict resolution, part 2/2 by Johan Herland · 14 years ago