Google Git
Sign in
googlers / jrn / git / 77e422439014eca6d898107106f1758a0ffd6058 / builtin / merge.c
  1. 905f16d Merge branch 'ma/reduce-heads-leakfix' by Junio C Hamano · 7 years ago
  2. 4da7264 reduce_heads: fix memory leaks by Martin Ågren · 7 years ago
  3. cca5fa6 refs: convert dwim_ref and expand_ref to struct object_id by brian m. carlson · 7 years ago
  4. 0f2dc72 refs: convert resolve_refdup and refs_resolve_refdup to struct object_id by brian m. carlson · 7 years ago
  5. ae07777 refs: convert update_ref and refs_update_ref to use struct object_id by brian m. carlson · 7 years ago
  6. d811ba1 Merge branch 'rs/strbuf-leakfix' by Junio C Hamano · 7 years ago
  7. 0543de4 Merge branch 'sb/merge-commit-msg-hook' by Junio C Hamano · 7 years ago
  8. 8e36002 Merge branch 'ma/up-to-date' by Junio C Hamano · 8 years ago
  9. f8b8635 builtin/merge: honor commit-msg hook for merges by Stefan Beller · 8 years ago
  10. 814c4b3 merge: release strbuf after use in write_merge_heads() by Rene Scharfe · 8 years ago
  11. 150888e merge: release strbuf after use in save_state() by Rene Scharfe · 8 years ago
  12. 6e6ba65 Merge branch 'mg/killed-merge' by Junio C Hamano · 8 years ago
  13. eabdcd4 Merge branch 'jt/packmigrate' by Junio C Hamano · 8 years ago
  14. bdfc15f Merge branch 'lg/merge-signoff' by Junio C Hamano · 8 years ago
  15. 3836d88 pack: move pack-closing functions by Jonathan Tan · 8 years ago
  16. 7560f54 treewide: correct several "up-to-date" to "up to date" by Martin Ågren · 8 years ago
  17. 9d89b35 merge: save merge state earlier by Michael J Gruber · 8 years ago
  18. 8e6a6bb merge: split write_merge_state in two by Michael J Gruber · 8 years ago
  19. 62dc42b merge: clarify call chain by Michael J Gruber · 8 years ago
  20. e2a2a1d Merge branch 'rs/merge-microcleanup' by Junio C Hamano · 8 years ago
  21. bdfcdef Merge branch 'ma/parse-maybe-bool' by Junio C Hamano · 8 years ago
  22. de3ce21 merge: use skip_prefix() by René Scharfe · 8 years ago
  23. 8957661 treewide: deprecate git_config_maybe_bool, use git_parse_maybe_bool by Martin Ågren · 8 years ago
  24. 14d01b4 merge: add a --signoff flag by Łukasz Gryglicki · 8 years ago
  25. f331ab9 use MOVE_ARRAY by René Scharfe · 8 years ago
  26. f31d23a Merge branch 'bw/config-h' by Junio C Hamano · 8 years ago
  27. a6f38c1 Merge branch 'bw/object-id' by Junio C Hamano · 8 years ago
  28. b2141fc config: don't include config.h by default by Brandon Williams · 8 years ago
  29. b9a7d55 Merge branch 'nd/fopen-errors' by Junio C Hamano · 8 years ago
  30. 66f414f diff-tree: convert diff_tree_sha1 to struct object_id by Brandon Williams · 8 years ago
  31. 23a9e07 use xfopen() in more places by Nguyễn Thái Ngọc Duy · 8 years ago
  32. a9dbc17 tree: convert parse_tree_indirect to struct object_id by brian m. carlson · 8 years ago
  33. f06e90d merge: convert checkout_fast_forward to struct object_id by brian m. carlson · 8 years ago
  34. bc83266 Convert lookup_commit* to struct object_id by brian m. carlson · 8 years ago
  35. b1081e4 Merge branch 'bc/object-id' by Junio C Hamano · 8 years ago
  36. 1fdbfc4 Merge branch 'jc/merge-drop-old-syntax' by Junio C Hamano · 8 years ago
  37. dc01505 Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZ by brian m. carlson · 8 years ago
  38. e1fae93 Merge branch 'bc/object-id' by Junio C Hamano · 8 years ago
  39. c809496 Merge branch 'jk/interpret-branch-name' by Junio C Hamano · 8 years ago
  40. 0e9f62d interpret_branch_name: allow callers to restrict expansions by Jeff King · 8 years ago
  41. 5268431 builtin/merge: convert to struct object_id by brian m. carlson · 8 years ago
  42. 05f6e1b Merge branch 'cp/merge-continue' by Junio C Hamano · 8 years ago
  43. c7d227d merge: mark usage error strings for translation by Jeff King · 8 years ago
  44. 042e290 merge: ensure '--abort' option takes no arguments by Chris Packham · 8 years ago
  45. 367ff69 merge: add '--continue' option as a synonym for 'git commit' by Chris Packham · 8 years ago
  46. b3e83cc hold_locked_index(): align error handling with hold_lockfile_for_update() by Junio C Hamano · 8 years ago
  47. ef2ed50 find_unique_abbrev: use 4-buffer ring by Jeff King · 8 years ago
  48. a22ae75 use strbuf_addstr() for adding constant strings to a strbuf, part 2 by René Scharfe · 8 years ago
  49. b32d7c5 Merge branch 'rs/merge-add-strategies-simplification' by Junio C Hamano · 9 years ago
  50. 02a8cfa merge: use string_list_split() in add_strategies() by René Scharfe · 9 years ago
  51. f241ff0 prepare the builtins for a libified merge_recursive() by Johannes Schindelin · 9 years ago
  52. 2b6456b Merge branch 'jk/write-file' by Junio C Hamano · 9 years ago
  53. a63d31b Merge branch 'bc/cocci' by Junio C Hamano · 9 years ago
  54. e78d5d4 use write_file_buf where applicable by Jeff King · 9 years ago
  55. c368dde coccinelle: apply object_id Coccinelle transformations by brian m. carlson · 9 years ago
  56. f449198 coccinelle: convert hashcpy() with null_sha1 to hashclr() by brian m. carlson · 9 years ago
  57. c8bb9d2 i18n: merge: change command option help to lowercase by Vasco Almeida · 9 years ago
  58. bef4830 i18n: merge: mark messages for translation by Vasco Almeida · 9 years ago
  59. f276cae Merge branch 'en/merge-trivial-fix' by Junio C Hamano · 9 years ago
  60. edc2f71 Merge branch 'dt/pre-refs-backend' by Junio C Hamano · 9 years ago
  61. 40d7194 builtin/merge.c: fix a bug with trivial merges by Elijah Newren · 9 years ago
  62. 17377b6 cmd_merge(): remove unneeded flag variable by Michael Haggerty · 9 years ago
  63. d04aa7e Merge branch 'jc/merge-refuse-new-root' by Junio C Hamano · 9 years ago
  64. aad627e Merge branch 'jv/merge-nothing-into-void' by Junio C Hamano · 9 years ago
  65. 5d2a30d Merge branch 'mm/diff-renames-default' by Junio C Hamano · 9 years ago
  66. e379fdf merge: refuse to create too cool a merge by default by Junio C Hamano · 9 years ago
  67. b84e65d merge: fix NULL pointer dereference when merging nothing into void by Junio C Hamano · 9 years ago
  68. 5404c11 diff: activate diff.renames by default by Matthieu Moy · 9 years ago
  69. 50a6c8e use st_add and st_mult for allocation size computation by Jeff King · 9 years ago
  70. dcacb1b merge: release pack files before garbage-collecting by Johannes Schindelin · 9 years ago
  71. ed1c997 Remove get_object_hash. by brian m. carlson · 9 years ago
  72. f2fd076 Convert struct object to object_id by brian m. carlson · 9 years ago
  73. 7999b2c Add several uses of get_object_hash. by brian m. carlson · 9 years ago
  74. 0692a6c Merge branch 'rs/pop-commit' by Junio C Hamano · 9 years ago
  75. 1ad7c0f Merge branch 'tk/stripspace' by Junio C Hamano · 9 years ago
  76. e510ab8 use pop_commit() for consuming the first entry of a struct commit_list by René Scharfe · 9 years ago
  77. 63af4a8 strbuf: make stripspace() part of strbuf by Tobias Klauser · 9 years ago
  78. d59f765 use sha1_to_hex_r() instead of strcpy by Jeff King · 9 years ago
  79. f932729 memoize common git-path "constant" files by Jeff King · 10 years ago
  80. c4a8354 Merge branch 'jk/at-push-sha1' by Junio C Hamano · 10 years ago
  81. 9e3751d remote.c: drop "remote" pointer from "struct branch" by Jeff King · 10 years ago
  82. bcd1ecd Merge branch 'jc/merge' by Junio C Hamano · 10 years ago
  83. b439165 merge: drop 'git merge <message> HEAD <commit>' syntax by Junio C Hamano · 10 years ago
  84. d45366e merge: deprecate 'git merge <message> HEAD <commit>' syntax by Junio C Hamano · 10 years ago
  85. 74e8bc5 merge: handle FETCH_HEAD internally by Junio C Hamano · 10 years ago
  86. 7703801 merge: decide if we auto-generate the message early in collect_parents() by Junio C Hamano · 10 years ago
  87. 1cf32f4 merge: make collect_parents() auto-generate the merge message by Junio C Hamano · 10 years ago
  88. 52fecab merge: extract prepare_merge_message() logic out by Junio C Hamano · 10 years ago
  89. 018b3fb merge: narrow scope of merge_names by Junio C Hamano · 10 years ago
  90. 34349db merge: split reduce_parents() out of collect_parents() by Junio C Hamano · 10 years ago
  91. 0b10b8a merge: clarify collect_parents() logic by Junio C Hamano · 10 years ago
  92. 1016658 merge: small leakfix and code simplification by Junio C Hamano · 10 years ago
  93. eaa4e59 merge: do not check argc to determine number of remote heads by Junio C Hamano · 10 years ago
  94. 1faac1c merge: clarify "pulling into void" special case by Junio C Hamano · 10 years ago
  95. 00c7e7e merge: simplify code flow by Junio C Hamano · 10 years ago
  96. 3d6bc9a Revert "merge: pass verbosity flag down to merge-recursive" by Junio C Hamano · 10 years ago
  97. 3cdff83 Merge branch 'jk/merge-quiet' by Junio C Hamano · 10 years ago
  98. 2bf15a3 merge: pass verbosity flag down to merge-recursive by Jeff King · 10 years ago
  99. 9c9b4f2 standardize usage info string format by Alex Henrie · 10 years ago
  100. d61e790 Merge branch 'rs/plug-strbuf-leak-in-merge' by Junio C Hamano · 10 years ago